diff options
author | Luiz Otavio O Souza <luiz@netgate.com> | 2015-09-15 12:28:02 -0500 |
---|---|---|
committer | Luiz Otavio O Souza <luiz@netgate.com> | 2015-10-20 11:21:23 -0500 |
commit | 1ee9a1ce0e84cdf487da06e392aaf36e818fc1b1 (patch) | |
tree | 9b9eb11ff6e68187302a0b78e785ecd209811e3d /sys/netipsec | |
parent | 88681ca3cab5b8ee9d2ab8dbed08dec08a0dc011 (diff) | |
download | FreeBSD-src-1ee9a1ce0e84cdf487da06e392aaf36e818fc1b1.zip FreeBSD-src-1ee9a1ce0e84cdf487da06e392aaf36e818fc1b1.tar.gz |
Revert IPSEC patches.
Revert "Importing pfSense patch ipsec_direct_dispatch.diff"
This reverts commit 9ed545f35cdf6da23726dadeb0e999d0d81e62eb.
TAG: IPSEC-HEAD
Issue: #4841
Diffstat (limited to 'sys/netipsec')
-rw-r--r-- | sys/netipsec/ipsec.c | 4 | ||||
-rw-r--r-- | sys/netipsec/ipsec.h | 2 | ||||
-rw-r--r-- | sys/netipsec/ipsec_input.c | 5 | ||||
-rw-r--r-- | sys/netipsec/xform_ipip.c | 8 |
4 files changed, 2 insertions, 17 deletions
diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c index da75107..f27019d 100644 --- a/sys/netipsec/ipsec.c +++ b/sys/netipsec/ipsec.c @@ -110,7 +110,6 @@ VNET_PCPUSTAT_SYSINIT(ipsec4stat); VNET_PCPUSTAT_SYSUNINIT(ipsec4stat); #endif /* VIMAGE */ -VNET_DEFINE(int, ipsec_direct_dispatch) = 1; VNET_DEFINE(int, ip4_ah_offsetmask) = 0; /* maybe IP_DF? */ /* DF bit on encap. 0: clear 1: set 2: copy */ VNET_DEFINE(int, ip4_ipsec_dfbit) = 0; @@ -158,9 +157,6 @@ SYSCTL_VNET_INT(_net_inet_ipsec, IPSECCTL_DEF_AH_NETLEV, ah_net_deflev, SYSCTL_VNET_INT(_net_inet_ipsec, IPSECCTL_AH_CLEARTOS, ah_cleartos, CTLFLAG_RW, &VNET_NAME(ah_cleartos), 0, "If set clear type-of-service field when doing AH computation."); -SYSCTL_VNET_INT(_net_inet_ipsec, OID_AUTO, directdispatch, - CTLFLAG_RW, &VNET_NAME(ipsec_direct_dispatch), 0, - "Use direct dispatching for incoming packets"); SYSCTL_VNET_INT(_net_inet_ipsec, IPSECCTL_AH_OFFSETMASK, ah_offsetmask, CTLFLAG_RW, &VNET_NAME(ip4_ah_offsetmask), 0, "If not set clear offset field mask when doing AH computation."); diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h index 39c4f6b..e50c401 100644 --- a/sys/netipsec/ipsec.h +++ b/sys/netipsec/ipsec.h @@ -299,7 +299,6 @@ VNET_DECLARE(int, ip4_esp_trans_deflev); VNET_DECLARE(int, ip4_esp_net_deflev); VNET_DECLARE(int, ip4_ah_trans_deflev); VNET_DECLARE(int, ip4_ah_net_deflev); -VNET_DECLARE(int, ipsec_direct_dispatch); VNET_DECLARE(int, ip4_ah_offsetmask); VNET_DECLARE(int, ip4_ipsec_dfbit); VNET_DECLARE(int, ip4_ipsec_ecn); @@ -313,7 +312,6 @@ VNET_DECLARE(int, crypto_support); #define V_ip4_esp_net_deflev VNET(ip4_esp_net_deflev) #define V_ip4_ah_trans_deflev VNET(ip4_ah_trans_deflev) #define V_ip4_ah_net_deflev VNET(ip4_ah_net_deflev) -#define V_ipsec_direct_dispatch VNET(ipsec_direct_dispatch) #define V_ip4_ah_offsetmask VNET(ip4_ah_offsetmask) #define V_ip4_ipsec_dfbit VNET(ip4_ipsec_dfbit) #define V_ip4_ipsec_ecn VNET(ip4_ipsec_ecn) diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c index c906d91..18a9b0c 100644 --- a/sys/netipsec/ipsec_input.c +++ b/sys/netipsec/ipsec_input.c @@ -525,10 +525,7 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav, goto bad; } - if (V_ipsec_direct_dispatch) - error = netisr_dispatch_src(isr_prot, (uintptr_t)sav->spi, m); - else - error = netisr_queue_src(isr_prot, (uintptr_t)sav->spi, m); + error = netisr_queue_src(isr_prot, (uintptr_t)sav->spi, m); if (error) { IPSEC_ISTAT(sproto, qfull); DPRINTF(("%s: queue full; proto %u packet dropped\n", diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c index 85f0642..9585eef 100644 --- a/sys/netipsec/xform_ipip.c +++ b/sys/netipsec/xform_ipip.c @@ -330,13 +330,7 @@ _ipip_input(struct mbuf *m, int iphlen, struct ifnet *gifp) panic("%s: bogus ip version %u", __func__, v>>4); } - if (V_ipsec_direct_dispatch) { - if (netisr_dispatch(isr, m)) { /* (0) on success. */ - IPIPSTAT_INC(ipips_qfull); - DPRINTF(("%s: packet dropped because of full queue\n", - __func__)); - } - } else if (netisr_queue(isr, m)) { /* (0) on success. */ + if (netisr_queue(isr, m)) { /* (0) on success. */ IPIPSTAT_INC(ipips_qfull); DPRINTF(("%s: packet dropped because of full queue\n", __func__)); |