p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vxlan: do not shadow flags variable 

The 'flags' variable is already defined in the outer scope.

Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Benc 2015-08-20 13:56:29 +02:00 committed by David S. Miller
parent 705cc62f67
commit 6f264e47d4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/vxlan.c
View File

@ -2025,7 +2025,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
} else { } else {
struct dst_entry *ndst; struct dst_entry *ndst;
struct flowi6 fl6; struct flowi6 fl6;
u32 flags; u32 rt6i_flags;
memset(&fl6, 0, sizeof(fl6)); memset(&fl6, 0, sizeof(fl6));
fl6.flowi6_oif = rdst ? rdst->remote_ifindex : 0; fl6.flowi6_oif = rdst ? rdst->remote_ifindex : 0;
@ -2050,9 +2050,9 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
} }
/* Bypass encapsulation if the destination is local */ /* Bypass encapsulation if the destination is local */
flags = ((struct rt6_info *)ndst)->rt6i_flags; rt6i_flags = ((struct rt6_info *)ndst)->rt6i_flags;
if (flags & RTF_LOCAL && if (rt6i_flags & RTF_LOCAL &&
!(flags & (RTCF_BROADCAST | RTCF_MULTICAST))) { !(rt6i_flags & (RTCF_BROADCAST | RTCF_MULTICAST))) {
struct vxlan_dev *dst_vxlan; struct vxlan_dev *dst_vxlan;
dst_release(ndst); dst_release(ndst);