vxlan: fix a shadow local variable
authorWANG Cong <xiyou.wangcong@gmail.com>
Wed, 8 Apr 2015 17:17:58 +0000 (10:17 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Apr 2015 18:56:35 +0000 (14:56 -0400)
Commit 79b16aadea32cce077
("udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb()")
introduce 'sk' but we already have one inner 'sk'.

Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/vxlan.c

index 51baac725a48ca8d71d708834a94c62651370b90..682838b48d3719d0d89038fa958f2f46123ea188 100644 (file)
@@ -1977,7 +1977,6 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
                iptunnel_xmit_stats(err, &dev->stats, dev->tstats);
 #if IS_ENABLED(CONFIG_IPV6)
        } else {
-               struct sock *sk = vxlan->vn_sock->sock->sk;
                struct dst_entry *ndst;
                struct flowi6 fl6;
                u32 flags;