From: Cong Wang <amwang@redhat.com>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
David Stevens <dlstevens@us.ibm.com>,
Cong Wang <amwang@redhat.com>
Subject: [Patch net-next v9 10/11] vxlan: respect scope_id for ll addr
Date: Mon, 27 May 2013 12:16:32 +0800 [thread overview]
Message-ID: <1369628193-14925-11-git-send-email-amwang@redhat.com> (raw)
In-Reply-To: <1369628193-14925-1-git-send-email-amwang@redhat.com>
From: Cong Wang <amwang@redhat.com>
As pointed out by David, we should take care of scope id for ll
addr, so use it for route lookup.
Cc: David S. Miller <davem@davemloft.net>
Cc: David Stevens <dlstevens@us.ibm.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
drivers/net/vxlan.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 4c9709e..bcb8a42 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1306,7 +1306,7 @@ static netdev_tx_t vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
struct sock *sk = vxlan->vn_sock->sock->sk;
struct ipv6hdr *ip6h;
#endif
- const union vxlan_addr *dst;
+ union vxlan_addr *dst;
struct dst_entry *ndst = NULL;
__be16 src_port = 0, dst_port;
u32 vni;
@@ -1401,6 +1401,12 @@ static netdev_tx_t vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
src_port = vxlan_src_port(vxlan, skb);
+ if (ipv6_addr_type(&dst->sin6.sin6_addr) & IPV6_ADDR_LINKLOCAL) {
+ dst->sin6.sin6_scope_id = ipv6_iface_scope_id(&dst->sin6.sin6_addr,
+ rdst->remote_ifindex);
+ rdst->remote_ifindex = dst->sin6.sin6_scope_id;
+ }
+
memset(&fl6, 0, sizeof(fl6));
fl6.flowi6_oif = rdst->remote_ifindex;
fl6.flowi6_tos = RT_TOS(tos);
--
1.7.7.6
next prev parent reply other threads:[~2013-05-27 4:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-27 4:16 [Patch net-next v9 00/11] vxlan: add ipv6 support Cong Wang
2013-05-27 4:16 ` [Patch net-next v9 01/11] vxlan: defer vxlan init as late as possible Cong Wang
2013-05-27 4:16 ` [Patch net-next v9 02/11] vxlan: use unsigned int instead of unsigned Cong Wang
2013-05-27 4:16 ` [Patch net-next v9 03/11] ipv6: make ip6_dst_hoplimit() static inline Cong Wang
2013-05-27 4:16 ` [Patch net-next v9 04/11] ipv6: move ip6_local_out into core kernel Cong Wang
2013-05-27 4:16 ` [Patch net-next v9 05/11] ipv6: export a stub for IPv6 symbols used by vxlan Cong Wang
2013-05-27 4:16 ` [Patch net-next v9 06/11] ipv6: export in6addr_loopback to modules Cong Wang
2013-05-27 4:16 ` [Patch net-next v9 07/11] vxlan: add ipv6 support Cong Wang
2013-05-27 4:16 ` [Patch net-next v9 08/11] vxlan: add ipv6 route short circuit support Cong Wang
2013-05-27 4:16 ` [Patch net-next v9 09/11] vxlan: add ipv6 proxy support Cong Wang
2013-05-27 4:16 ` Cong Wang [this message]
2013-05-27 4:16 ` [Patch net-next v9 11/11] ipv6: Add generic UDP Tunnel segmentation Cong Wang
2013-05-27 8:39 ` [Patch net-next v9 00/11] vxlan: add ipv6 support Bjørn Mork
2013-05-27 8:57 ` Bjørn Mork
2013-05-27 9:30 ` David Miller
2013-05-27 10:54 ` Cong Wang
2013-05-27 11:12 ` Cong Wang
2013-05-27 11:00 ` Cong Wang
2013-05-27 13:07 ` Bjørn Mork
2013-05-28 2:42 ` Cong Wang
2013-05-28 7:28 ` Bjørn Mork
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=1369628193-14925-11-git-send-email-amwang@redhat.com \
--to=amwang@redhat.com \
--cc=davem@davemloft.net \
--cc=dlstevens@us.ibm.com \
--cc=netdev@vger.kernel.org \
/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).