diff options
author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-08-24 09:41:13 +0000 |
---|---|---|
committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-08-24 09:41:13 +0000 |
commit | d2c8a3df2a60c97074e06db43213a39d9d97355c (patch) | |
tree | c07ac000bea09d67b9cf2da7207d4a574f2f7019 /sys/netinet6/frag6.c | |
parent | 2b7122cd9de64cdf9ca22ec38d1583911166fd78 (diff) |
Kill ip6_forward_rt reducing differences between v4 and v6.
A single forwarding cache is not the answer. The answer is 42... err PF!
ok bluhm@
Diffstat (limited to 'sys/netinet6/frag6.c')
-rw-r--r-- | sys/netinet6/frag6.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index 9f281150e5e..39de30cac21 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frag6.c,v 1.68 2016/08/22 10:33:22 mpi Exp $ */ +/* $OpenBSD: frag6.c,v 1.69 2016/08/24 09:41:12 mpi Exp $ */ /* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */ /* @@ -596,9 +596,9 @@ void frag6_slowtimo(void) { struct ip6q *q6, *nq6; - int s = splsoftnet(); - extern struct route_in6 ip6_forward_rt; + int s; + s = splsoftnet(); IP6Q_LOCK(); TAILQ_FOREACH_SAFE(q6, &frag6_queue, ip6q_queue, nq6) if (--q6->ip6q_ttl == 0) { @@ -617,17 +617,6 @@ frag6_slowtimo(void) frag6_freef(TAILQ_LAST(&frag6_queue, ip6q_head)); } IP6Q_UNLOCK(); - - /* - * Routing changes might produce a better route than we last used; - * make sure we notice eventually, even if forwarding only for one - * destination and the cache is never replaced. - */ - if (ip6_forward_rt.ro_rt) { - rtfree(ip6_forward_rt.ro_rt); - ip6_forward_rt.ro_rt = NULL; - } - splx(s); } |