diff options
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if.h | 4 | ||||
| -rw-r--r-- | sys/net/pf.c | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/net/if.h b/sys/net/if.h index ebef78c1268..9a1fc0fca5c 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if.h,v 1.130 2011/11/02 02:03:47 haesbaert Exp $ */ +/* $OpenBSD: if.h,v 1.131 2011/12/02 03:15:31 haesbaert Exp $ */ /* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */ /* @@ -355,10 +355,8 @@ struct ifnet { /* and the entries */ #define IFCAP_CSUM_IPv4 0x00000001 /* can do IPv4 header csum */ #define IFCAP_CSUM_TCPv4 0x00000002 /* can do IPv4/TCP csum */ #define IFCAP_CSUM_UDPv4 0x00000004 /* can do IPv4/UDP csum */ -#define IFCAP_IPSEC 0x00000008 /* can do IPsec */ #define IFCAP_VLAN_MTU 0x00000010 /* VLAN-compatible MTU */ #define IFCAP_VLAN_HWTAGGING 0x00000020 /* hardware VLAN tag support */ -#define IFCAP_IPCOMP 0x00000040 /* can do IPcomp */ #define IFCAP_CSUM_TCPv6 0x00000080 /* can do IPv6/TCP checksums */ #define IFCAP_CSUM_UDPv6 0x00000100 /* can do IPv6/UDP checksums */ #define IFCAP_WOL 0x00008000 /* can do wake on lan */ diff --git a/sys/net/pf.c b/sys/net/pf.c index 30fc5a03959..725ca496ed5 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.788 2011/11/28 01:04:50 dlg Exp $ */ +/* $OpenBSD: pf.c,v 1.789 2011/12/02 03:15:31 haesbaert Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -5828,11 +5828,10 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp, /* Copied from ip_output. */ #ifdef IPSEC /* - * If deferred crypto processing is needed, check that the - * interface supports it. + * If we got here and IPsec crypto processing didn't happen, drop it. */ if ((mtag = m_tag_find(m0, PACKET_TAG_IPSEC_OUT_CRYPTO_NEEDED, NULL)) - != NULL && (ifp->if_capabilities & IFCAP_IPSEC) == 0) { + != NULL) { /* Notify IPsec to do its own crypto. */ ipsp_skipcrypto_unmark((struct tdb_ident *)(mtag + 1)); goto bad; |