diff options
author | Renato Botelho <renato@netgate.com> | 2016-09-23 08:13:13 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-09-23 08:13:13 -0300 |
commit | d28ed6dad4ec5b92e6814ad0e35363797ff4e5fc (patch) | |
tree | 9479c74c340b7aa161821ad20c16214b1bcc8736 /sys/netinet6/ip6_output.c | |
parent | 4f13960fb31cfa7bc3bc3c32ee15aa549835e257 (diff) | |
parent | 770fd2290bb6cf4a2d04e3565c90a4ca036bf546 (diff) | |
download | FreeBSD-src-d28ed6dad4ec5b92e6814ad0e35363797ff4e5fc.zip FreeBSD-src-d28ed6dad4ec5b92e6814ad0e35363797ff4e5fc.tar.gz |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'sys/netinet6/ip6_output.c')
-rw-r--r-- | sys/netinet6/ip6_output.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index f31679e..2b0e50d 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -87,6 +87,7 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <net/if_var.h> +#include <net/if_llatbl.h> #include <net/netisr.h> #include <net/route.h> #include <net/pfil.h> @@ -552,6 +553,9 @@ again: rt = ro->ro_rt; ifp = ro->ro_rt->rt_ifp; } else { + if (ro->ro_lle) + LLE_FREE(ro->ro_lle); /* zeros ro_lle */ + ro->ro_lle = NULL; if (fwd_tag == NULL) { bzero(&dst_sa, sizeof(dst_sa)); dst_sa.sin6_family = AF_INET6; @@ -821,6 +825,9 @@ again: } else { RO_RTFREE(ro); needfiblookup = 1; /* Redo the routing table lookup. */ + if (ro->ro_lle) + LLE_FREE(ro->ro_lle); /* zeros ro_lle */ + ro->ro_lle = NULL; } } /* See if fib was changed by packet filter. */ @@ -829,6 +836,9 @@ again: fibnum = M_GETFIB(m); RO_RTFREE(ro); needfiblookup = 1; + if (ro->ro_lle) + LLE_FREE(ro->ro_lle); /* zeros ro_lle */ + ro->ro_lle = NULL; } if (needfiblookup) goto again; |