diff options
| author | Sven Wegener <sven.wegener@stealer.net> | 2014-05-30 00:27:06 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-06 03:23:08 +0400 |
| commit | 9e89fd8b7db71038fd9f70f34e210963fa8fc980 (patch) | |
| tree | 0fc40f6dc1653595f1dfcd56c78528e74779491a /net | |
| parent | f666f87b9423fb534d2116206ace04495080f2b5 (diff) | |
| download | linux-9e89fd8b7db71038fd9f70f34e210963fa8fc980.tar.xz | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/udp.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 4180f54a948e..95c834799288 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -705,35 +705,34 @@ static struct sock *udp_v6_mcast_next(struct net *net, struct sock *sk, int dif) { struct hlist_nulls_node *node; - struct sock *s = sk; unsigned short num = ntohs(loc_port); - sk_nulls_for_each_from(s, node) { - struct inet_sock *inet = inet_sk(s); + sk_nulls_for_each_from(sk, node) { + struct inet_sock *inet = inet_sk(sk); - if (!net_eq(sock_net(s), net)) + if (!net_eq(sock_net(sk), net)) continue; - if (udp_sk(s)->udp_port_hash == num && - s->sk_family == PF_INET6) { + if (udp_sk(sk)->udp_port_hash == num && + sk->sk_family == PF_INET6) { if (inet->inet_dport) { if (inet->inet_dport != rmt_port) continue; } - if (!ipv6_addr_any(&s->sk_v6_daddr) && - !ipv6_addr_equal(&s->sk_v6_daddr, rmt_addr)) + if (!ipv6_addr_any(&sk->sk_v6_daddr) && + !ipv6_addr_equal(&sk->sk_v6_daddr, rmt_addr)) 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; - if (!ipv6_addr_any(&s->sk_v6_rcv_saddr)) { - if (!ipv6_addr_equal(&s->sk_v6_rcv_saddr, loc_addr)) + if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) { + if (!ipv6_addr_equal(&sk->sk_v6_rcv_saddr, loc_addr)) continue; } - if (!inet6_mc_check(s, loc_addr, rmt_addr)) + if (!inet6_mc_check(sk, loc_addr, rmt_addr)) continue; - return s; + return sk; } } return NULL; |