diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2015-09-15 12:30:58 -0500 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2015-10-20 11:33:42 -0500 |
| commit | 49d7fe39863f0ffcf4ac6c559ef84589ea42bd0a (patch) | |
| tree | 24cdbb3972d1aead1ff420f1e8e4984c8ef906a0 /sys/net | |
| parent | 15988797df0ce562e67d6fa1c912e4cda6194678 (diff) | |
| download | FreeBSD-src-49d7fe39863f0ffcf4ac6c559ef84589ea42bd0a.zip FreeBSD-src-49d7fe39863f0ffcf4ac6c559ef84589ea42bd0a.tar.gz | |
Revert IPSEC patches.
Revert "Importing pfSense patch ipsec_altq.RELENG_10.diff"
This reverts commit 5b128f054452e56b96564210c998510e0dd45130.
TAG: IPSEC-HEAD
Issue: #4841
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_enc.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index ea78088..dcb82f5 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -52,9 +52,6 @@ #include <net/bpf.h> #include <net/vnet.h> -#include <altq/if_altq.h> -#include <netpfil/pf/pf_mtag.h> - #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> @@ -228,11 +225,10 @@ enc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) } int -ipsec_filter(struct mbuf **mp, struct secasindex *saidx, int dir, int flags) +ipsec_filter(struct mbuf **mp, int dir, int flags) { int error, i; struct ip *ip; - struct pf_mtag *atag; KASSERT(encif != NULL, ("%s: encif is null", __func__)); KASSERT(flags & (ENC_IN|ENC_OUT), @@ -301,9 +297,6 @@ ipsec_filter(struct mbuf **mp, struct secasindex *saidx, int dir, int flags) if (error != 0) goto bad; - if (saidx && (atag = pf_find_mtag(*mp)) != NULL) - saidx->qid = atag->qid; - return (error); bad: |
