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/net/pf.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/net/pf.c')
| -rw-r--r-- | sys/net/pf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index b63b7041468..fab142dfee6 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.537 2007/05/31 18:48:05 mcbride Exp $ */ +/* $OpenBSD: pf.c,v 1.538 2007/06/01 00:52:38 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1717,7 +1717,7 @@ pf_send_tcp(const struct pf_rule *r, sa_family_t af, h6->ip6_vfc |= IPV6_VERSION; h6->ip6_hlim = IPV6_DEFHLIM; - ip6_output(m, NULL, NULL, 0, NULL, NULL); + ip6_output(m, NULL, NULL, 0, NULL, NULL, NULL); break; #endif /* INET6 */ } @@ -5795,7 +5795,7 @@ pf_route6(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp, /* Cheat. XXX why only in the v6 case??? */ if (r->rt == PF_FASTROUTE) { m0->m_pkthdr.pf.flags |= PF_TAG_GENERATED; - ip6_output(m0, NULL, NULL, 0, NULL, NULL); + ip6_output(m0, NULL, NULL, 0, NULL, NULL, NULL); return; } |