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/netipsec/ipsec_input.c | |
| 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/netipsec/ipsec_input.c')
| -rw-r--r-- | sys/netipsec/ipsec_input.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c index 18a9b0c..66de530 100644 --- a/sys/netipsec/ipsec_input.c +++ b/sys/netipsec/ipsec_input.c @@ -354,8 +354,7 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav, /* Pass the mbuf to enc0 for bpf and pfil. */ ipsec_bpf(m, sav, AF_INET, ENC_IN|ENC_BEFORE); - if ((error = ipsec_filter(&m, &sav->sah->saidx, PFIL_IN, - ENC_IN|ENC_BEFORE)) != 0) + if ((error = ipsec_filter(&m, PFIL_IN, ENC_IN|ENC_BEFORE)) != 0) return (error); #endif /* DEV_ENC */ @@ -499,8 +498,7 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav, ipsec_bpf(m, sav, AF_INET6, ENC_IN|ENC_AFTER); #endif - if ((error = ipsec_filter(&m, &sav->sah->saidx, PFIL_IN, - ENC_IN|ENC_AFTER)) != 0) + if ((error = ipsec_filter(&m, PFIL_IN, ENC_IN|ENC_AFTER)) != 0) return (error); #endif /* DEV_ENC */ @@ -655,8 +653,7 @@ ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, int proto /* Pass the mbuf to enc0 for bpf and pfil. */ ipsec_bpf(m, sav, AF_INET6, ENC_IN|ENC_BEFORE); - if ((error = ipsec_filter(&m, &sav->sah->saidx, PFIL_IN, - ENC_IN|ENC_BEFORE)) != 0) + if ((error = ipsec_filter(&m, PFIL_IN, ENC_IN|ENC_BEFORE)) != 0) return (error); #endif /* DEV_ENC */ @@ -785,8 +782,7 @@ ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, int proto if (prot == IPPROTO_IPV6) ipsec_bpf(m, sav, AF_INET6, ENC_IN|ENC_AFTER); - if ((error = ipsec_filter(&m, &sav->sah->saidx, PFIL_IN, - ENC_IN|ENC_AFTER)) != 0) + if ((error = ipsec_filter(&m, PFIL_IN, ENC_IN|ENC_AFTER)) != 0) return (error); #endif /* DEV_ENC */ /* |
