netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [Patch net-next] vxlan: fix a shadow local variable
@ 2015-04-08 17:17 Cong Wang
  2015-04-08 19:03 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Cong Wang @ 2015-04-08 17:17 UTC (permalink / raw)
  To: netdev; +Cc: Cong Wang, David S. Miller

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>
---
 drivers/net/vxlan.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 51baac7..682838b 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;
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Patch net-next] vxlan: fix a shadow local variable
  2015-04-08 17:17 [Patch net-next] vxlan: fix a shadow local variable Cong Wang
@ 2015-04-08 19:03 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-04-08 19:03 UTC (permalink / raw)
  To: xiyou.wangcong; +Cc: netdev

From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Wed,  8 Apr 2015 10:17:58 -0700

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

Applied.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-04-08 19:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-08 17:17 [Patch net-next] vxlan: fix a shadow local variable Cong Wang
2015-04-08 19:03 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).