diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2007-06-01 00:52:40 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2007-06-01 00:52:40 +0000 |
| commit | 078e3b8342fd27a3f38f7aa29dbbde3c07273337 (patch) | |
| tree | 4a5ad6410095ab27fe1e6014e3797bfe206f2d42 /sys/netinet6/icmp6.c | |
| parent | 0ac0ef2090fda4d15062e512580f65fa7d930e93 (diff) | |
apply the "skip ipsec if there are no flows" speedup diff to IPv6 too.
we need a pointer to the inpcb to decide, which was not previously
passed to ip6_output, so this diff is a little bigger.
from itojun, ok ryan
Diffstat (limited to 'sys/netinet6/icmp6.c')
| -rw-r--r-- | sys/netinet6/icmp6.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index aaa3c57f5f1..4a0e360a936 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp6.c,v 1.93 2007/03/18 23:23:17 mpf Exp $ */ +/* $OpenBSD: icmp6.c,v 1.94 2007/06/01 00:52:38 henning Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -2134,7 +2134,8 @@ icmp6_reflect(m, off) * Note that only echo and node information replies are affected, * since the length of ICMP6 errors is limited to the minimum MTU. */ - if (ip6_output(m, NULL, NULL, IPV6_MINMTU, NULL, &outif) != 0 && outif) + if (ip6_output(m, NULL, NULL, IPV6_MINMTU, NULL, &outif, NULL) != 0 && + outif) icmp6_ifstat_inc(outif, ifs6_out_error); if (outif) @@ -2634,7 +2635,7 @@ noredhdropt: = in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), ntohs(ip6->ip6_plen)); /* send the packet to outside... */ - if (ip6_output(m, NULL, NULL, 0, NULL, NULL) != 0) + if (ip6_output(m, NULL, NULL, 0, NULL, NULL, NULL) != 0) icmp6_ifstat_inc(ifp, ifs6_out_error); icmp6_ifstat_inc(ifp, ifs6_out_msg); |