]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ipv4: remove the unnecessary variable in udp_mcast_next
authorLi RongQing <roy.qing.li@gmail.com>
Fri, 11 Jul 2014 06:32:17 +0000 (14:32 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 11 Jul 2014 21:08:17 +0000 (14:08 -0700)
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/udp.c

index d92f94b7e4025dd4779e75e6a75f2de560713778..ac30e106a88464435f9a3b6415413da00b00cdb8 100644 (file)
@@ -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;
 }
 
 /*