vxlan: do not shadow flags variable
authorJiri Benc <jbenc@redhat.com>
Thu, 20 Aug 2015 11:56:29 +0000 (13:56 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Aug 2015 22:42:37 +0000 (15:42 -0700)
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>
drivers/net/vxlan.c

index 070149f77072414f605e7bb33a4fde1367400094..2c1abf95c17d1c1ed9099b116f523097ee5b95e3 100644 (file)
@@ -2025,7 +2025,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
        } else {
                struct dst_entry *ndst;
                struct flowi6 fl6;
-               u32 flags;
+               u32 rt6i_flags;
 
                memset(&fl6, 0, sizeof(fl6));
                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 */
-               flags = ((struct rt6_info *)ndst)->rt6i_flags;
-               if (flags & RTF_LOCAL &&
-                   !(flags & (RTCF_BROADCAST | RTCF_MULTICAST))) {
+               rt6i_flags = ((struct rt6_info *)ndst)->rt6i_flags;
+               if (rt6i_flags & RTF_LOCAL &&
+                   !(rt6i_flags & (RTCF_BROADCAST | RTCF_MULTICAST))) {
                        struct vxlan_dev *dst_vxlan;
 
                        dst_release(ndst);