diff options
author | Jiri Benc <jbenc@redhat.com> | 2015-08-20 13:56:29 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-20 15:42:37 -0700 |
commit | 6f264e47d4dbbe590ac1131587933bb87ded296d (patch) | |
tree | 2e99c2d7cb419de9869aef57f37b79b2e531f153 /drivers/net/vxlan.c | |
parent | 705cc62f6728c5a23e3c82465aa94e652e0b50e4 (diff) | |
download | linux-stable-6f264e47d4dbbe590ac1131587933bb87ded296d.tar.gz linux-stable-6f264e47d4dbbe590ac1131587933bb87ded296d.tar.bz2 linux-stable-6f264e47d4dbbe590ac1131587933bb87ded296d.zip |
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>
Diffstat (limited to 'drivers/net/vxlan.c')
-rw-r--r-- | drivers/net/vxlan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 070149f77072..2c1abf95c17d 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -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); |