From: WANG Cong <xiyou.wangcong@gmail.com>
Date: Wed, 8 Apr 2015 17:17:58 +0000 (-0700)
Subject: vxlan: fix a shadow local variable
X-Git-Tag: v4.1-rc1~128^2~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2790460e145d198fe6925d405301a49b2d8cb03f;p=thirdparty%2Fkernel%2Flinux.git

vxlan: fix a shadow local variable

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>
---

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 51baac725a48c..682838b48d371 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -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;