diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-20 15:42:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-20 15:42:38 -0700 |
| commit | 08617f47eaf8c70b4c236dee2014c6141aa282bf (patch) | |
| tree | 843d49a4140901de8dd9bb147440b27c819c388a /net/core/dst.c | |
| parent | 938049e18dca57bcd2f93986fc1cbb5a83cdf027 (diff) | |
| parent | 32a2b002ce615eadd3bfaddabde290f70a1dd17b (diff) | |
Merge branch 'lwt-ipv6'
Jiri Benc says:
====================
lwtunnel: per route ipv6 support for vxlan
v3: Moved LWTUNNEL_ENCAP_IP6 definition in patch 13.
v2: Fixed issues in patch 4 pointed out by Alexei.
This series enables IPv6 tunnels based on lwtunnel infrastructure. Only
vxlan is supported for now.
Tested in all combinations of IPv4 over IPv6, IPv6 over IPv4 and IPv6 over
IPv6.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dst.c')
| -rw-r--r-- | net/core/dst.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/dst.c b/net/core/dst.c index f8694d1b8702..50dcdbb0ee46 100644 --- a/net/core/dst.c +++ b/net/core/dst.c @@ -20,6 +20,7 @@ #include <net/net_namespace.h> #include <linux/sched.h> #include <linux/prefetch.h> +#include <net/lwtunnel.h> #include <net/dst.h> #include <net/dst_metadata.h> @@ -184,6 +185,7 @@ void dst_init(struct dst_entry *dst, struct dst_ops *ops, #ifdef CONFIG_IP_ROUTE_CLASSID dst->tclassid = 0; #endif + dst->lwtstate = NULL; atomic_set(&dst->__refcnt, initial_ref); dst->__use = 0; dst->lastuse = jiffies; @@ -264,6 +266,7 @@ again: kfree(dst); else kmem_cache_free(dst->ops->kmem_cachep, dst); + lwtstate_put(dst->lwtstate); dst = child; if (dst) { |