Commit 6f264e47 authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

vxlan: do not shadow flags variable 



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

Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 705cc62f

drivers/net/vxlan.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -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);