aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorLi RongQing <roy.qing.li@gmail.com>2014-07-11 14:32:17 +0800
committerDavid S. Miller <davem@davemloft.net>2014-07-11 14:08:17 -0700
commita2f983f83b0f66a74a045d36eb84e2f01bb950c7 (patch)
tree6fffa09dcc493a80dd32032b5cca6e17b84e5732 /net/ipv4
parentdp83640: Adjust ptp event timestamps (diff)
downloadlinux-dev-a2f983f83b0f66a74a045d36eb84e2f01bb950c7.tar.xz
linux-dev-a2f983f83b0f66a74a045d36eb84e2f01bb950c7.zip
ipv4: remove the unnecessary variable in udp_mcast_next
Signed-off-by: Li RongQing <roy.qing.li@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/udp.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index d92f94b7e402..ac30e106a884 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -600,19 +600,18 @@ static inline struct sock *udp_v4_mcast_next(struct net *net, struct sock *sk,
int dif)
{
struct hlist_nulls_node *node;
- struct sock *s = sk;
unsigned short hnum = ntohs(loc_port);
- sk_nulls_for_each_from(s, node) {
- if (__udp_is_mcast_sock(net, s,
+ sk_nulls_for_each_from(sk, node) {
+ if (__udp_is_mcast_sock(net, sk,
loc_port, loc_addr,
rmt_port, rmt_addr,
dif, hnum))
goto found;
}
- s = NULL;
+ sk = NULL;
found:
- return s;
+ return sk;
}
/*