diff options
author | Cong Wang <amwang@redhat.com> | 2013-08-31 01:44:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-31 22:30:01 -0400 |
commit | f564f45c451809aa3b74f577754528520d315ac1 (patch) | |
tree | 6bebdf8d9a149b4d370a5f43ccd86935adbbc273 /net/ipv6 | |
parent | f39dc1023d6b9933528638a0c2dd618b4fdf664e (diff) |
vxlan: add ipv6 proxy support
This patch adds the IPv6 version of "arp_reduce", ndisc_send_na()
will be needed.
Cc: David S. Miller <davem@davemloft.net>
Cc: David Stevens <dlstevens@us.ibm.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/af_inet6.c | 2 | ||||
-rw-r--r-- | net/ipv6/ndisc.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 1996a7c34f73..136fe55c1a47 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
@@ -56,6 +56,7 @@ | |||
56 | #include <net/transp_v6.h> | 56 | #include <net/transp_v6.h> |
57 | #include <net/ip6_route.h> | 57 | #include <net/ip6_route.h> |
58 | #include <net/addrconf.h> | 58 | #include <net/addrconf.h> |
59 | #include <net/ndisc.h> | ||
59 | #ifdef CONFIG_IPV6_TUNNEL | 60 | #ifdef CONFIG_IPV6_TUNNEL |
60 | #include <net/ip6_tunnel.h> | 61 | #include <net/ip6_tunnel.h> |
61 | #endif | 62 | #endif |
@@ -815,6 +816,7 @@ static const struct ipv6_stub ipv6_stub_impl = { | |||
815 | .ipv6_sock_mc_drop = ipv6_sock_mc_drop, | 816 | .ipv6_sock_mc_drop = ipv6_sock_mc_drop, |
816 | .ipv6_dst_lookup = ip6_dst_lookup, | 817 | .ipv6_dst_lookup = ip6_dst_lookup, |
817 | .udpv6_encap_enable = udpv6_encap_enable, | 818 | .udpv6_encap_enable = udpv6_encap_enable, |
819 | .ndisc_send_na = ndisc_send_na, | ||
818 | .nd_tbl = &nd_tbl, | 820 | .nd_tbl = &nd_tbl, |
819 | }; | 821 | }; |
820 | 822 | ||
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index bb6fd95a5cd1..14bd2f9d9dbb 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -461,10 +461,10 @@ static void ndisc_send_skb(struct sk_buff *skb, | |||
461 | rcu_read_unlock(); | 461 | rcu_read_unlock(); |
462 | } | 462 | } |
463 | 463 | ||
464 | static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, | 464 | void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, |
465 | const struct in6_addr *daddr, | 465 | const struct in6_addr *daddr, |
466 | const struct in6_addr *solicited_addr, | 466 | const struct in6_addr *solicited_addr, |
467 | bool router, bool solicited, bool override, bool inc_opt) | 467 | bool router, bool solicited, bool override, bool inc_opt) |
468 | { | 468 | { |
469 | struct sk_buff *skb; | 469 | struct sk_buff *skb; |
470 | struct in6_addr tmpaddr; | 470 | struct in6_addr tmpaddr; |