ipv6: Shrink udp_v6_mcast_next() to one socket variable
To avoid the confusion of having two variables, shrink the function to only use the parameter variable for looping. Cc: Eric Dumazet <edumazet@google.com> Signed-off-by: Sven Wegener <sven.wegener@stealer.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f666f87b94
commit
9e89fd8b7d
|
@ -705,35 +705,34 @@ static struct sock *udp_v6_mcast_next(struct net *net, struct sock *sk,
|
||||||
int dif)
|
int dif)
|
||||||
{
|
{
|
||||||
struct hlist_nulls_node *node;
|
struct hlist_nulls_node *node;
|
||||||
struct sock *s = sk;
|
|
||||||
unsigned short num = ntohs(loc_port);
|
unsigned short num = ntohs(loc_port);
|
||||||
|
|
||||||
sk_nulls_for_each_from(s, node) {
|
sk_nulls_for_each_from(sk, node) {
|
||||||
struct inet_sock *inet = inet_sk(s);
|
struct inet_sock *inet = inet_sk(sk);
|
||||||
|
|
||||||
if (!net_eq(sock_net(s), net))
|
if (!net_eq(sock_net(sk), net))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (udp_sk(s)->udp_port_hash == num &&
|
if (udp_sk(sk)->udp_port_hash == num &&
|
||||||
s->sk_family == PF_INET6) {
|
sk->sk_family == PF_INET6) {
|
||||||
if (inet->inet_dport) {
|
if (inet->inet_dport) {
|
||||||
if (inet->inet_dport != rmt_port)
|
if (inet->inet_dport != rmt_port)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!ipv6_addr_any(&s->sk_v6_daddr) &&
|
if (!ipv6_addr_any(&sk->sk_v6_daddr) &&
|
||||||
!ipv6_addr_equal(&s->sk_v6_daddr, rmt_addr))
|
!ipv6_addr_equal(&sk->sk_v6_daddr, rmt_addr))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (s->sk_bound_dev_if && s->sk_bound_dev_if != dif)
|
if (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!ipv6_addr_any(&s->sk_v6_rcv_saddr)) {
|
if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) {
|
||||||
if (!ipv6_addr_equal(&s->sk_v6_rcv_saddr, loc_addr))
|
if (!ipv6_addr_equal(&sk->sk_v6_rcv_saddr, loc_addr))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!inet6_mc_check(s, loc_addr, rmt_addr))
|
if (!inet6_mc_check(sk, loc_addr, rmt_addr))
|
||||||
continue;
|
continue;
|
||||||
return s;
|
return sk;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Loading…
Reference in a new issue