summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2015-04-08 10:17:58 -0700
committerDavid S. Miller <davem@davemloft.net>2015-04-08 14:56:35 -0400
commit2790460e145d198fe6925d405301a49b2d8cb03f (patch)
tree213513beddd7d9c7d664e300706704e01fa6e078 /drivers/net
parent803afb316eba2df2bba16d984eb90b67c147c922 (diff)
downloadlinux-2790460e145d198fe6925d405301a49b2d8cb03f.tar.bz2
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/vxlan.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 51baac725a48..682838b48d37 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;