From: Jiri Benc <jbenc@redhat.com>
To: netdev@vger.kernel.org
Cc: Thomas Graf <tgraf@suug.ch>
Subject: [PATCH v2 net-next 10/13] vxlan: do not shadow flags variable
Date: Wed, 19 Aug 2015 12:10:00 +0200 [thread overview]
Message-ID: <90a1de02af35b7162dafc47049c8da11f921ce3c.1439978875.git.jbenc@redhat.com> (raw)
In-Reply-To: <cover.1439978875.git.jbenc@redhat.com>
The 'flags' variable is already defined in the outer scope.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
---
drivers/net/vxlan.c | 8 ++++----
1 file 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);
--
1.8.3.1
next prev parent reply other threads:[~2015-08-19 10:11 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-19 10:09 [PATCH v2 net-next 00/13] lwtunnel: per route ipv6 support for vxlan Jiri Benc
2015-08-19 10:09 ` [PATCH v2 net-next 01/13] ip_tunnels: remove custom alignment and packing Jiri Benc
2015-08-19 16:20 ` Thomas Graf
2015-08-19 10:09 ` [PATCH v2 net-next 02/13] ip_tunnels: use u8/u16/u32 Jiri Benc
2015-08-19 16:21 ` Thomas Graf
2015-08-19 10:09 ` [PATCH v2 net-next 03/13] ip_tunnels: use offsetofend Jiri Benc
2015-08-19 16:25 ` Thomas Graf
2015-08-19 10:09 ` [PATCH v2 net-next 04/13] ip_tunnels: add IPv6 addresses to ip_tunnel_key Jiri Benc
2015-08-19 16:29 ` Thomas Graf
2015-08-19 18:55 ` Alexei Starovoitov
2015-08-19 10:09 ` [PATCH v2 net-next 05/13] ip_tunnels: use tos and ttl fields also for IPv6 Jiri Benc
2015-08-19 16:31 ` Thomas Graf
2015-08-19 10:09 ` [PATCH v2 net-next 06/13] route: move lwtunnel state to dst_entry Jiri Benc
2015-08-19 16:38 ` Thomas Graf
2015-08-19 10:09 ` [PATCH v2 net-next 07/13] ipv6: drop metadata dst in ip6_route_input Jiri Benc
2015-08-19 16:41 ` Thomas Graf
2015-08-19 10:09 ` [PATCH v2 net-next 08/13] ipv6: ndisc: inherit metadata dst when creating ndisc requests Jiri Benc
2015-08-19 16:47 ` Thomas Graf
2015-08-19 10:09 ` [PATCH v2 net-next 09/13] vxlan: provide access function for vxlan socket address family Jiri Benc
2015-08-19 16:49 ` Thomas Graf
2015-08-19 10:10 ` Jiri Benc [this message]
2015-08-19 17:52 ` [PATCH v2 net-next 10/13] vxlan: do not shadow flags variable Thomas Graf
2015-08-19 10:10 ` [PATCH v2 net-next 11/13] vxlan: metadata based tunneling for IPv6 Jiri Benc
2015-08-19 17:57 ` Thomas Graf
2015-08-19 19:01 ` Alexei Starovoitov
2015-08-19 10:10 ` [PATCH v2 net-next 12/13] ipv6: route: extend flow representation with tunnel key Jiri Benc
2015-08-19 18:00 ` Thomas Graf
2015-08-19 10:10 ` [PATCH v2 net-next 13/13] ipv6: route: per route IP tunnel metadata via lightweight tunnel Jiri Benc
2015-08-19 10:17 ` YOSHIFUJI Hideaki
2015-08-19 10:20 ` Jiri Benc
2015-08-19 10:27 ` YOSHIFUJI Hideaki
2015-08-19 10:31 ` Jiri Benc
2015-08-20 2:29 ` YOSHIFUJI Hideaki
2015-08-20 5:15 ` David Miller
2015-08-19 18:03 ` Thomas Graf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=90a1de02af35b7162dafc47049c8da11f921ce3c.1439978875.git.jbenc@redhat.com \
--to=jbenc@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=tgraf@suug.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).