summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/netipsec/ipsec.c4
-rw-r--r--sys/netipsec/ipsec.h1
-rw-r--r--sys/netipsec/ipsec_input.c2
-rw-r--r--sys/netipsec/ipsec_output.c3
-rw-r--r--sys/netipsec/xform_ah.c4
-rw-r--r--sys/netipsec/xform_esp.c4
-rw-r--r--sys/netipsec/xform_ipcomp.c4
-rw-r--r--sys/netipsec/xform_ipip.c2
8 files changed, 0 insertions, 24 deletions
diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c
index 8db26e8..869fcc5 100644
--- a/sys/netipsec/ipsec.c
+++ b/sys/netipsec/ipsec.c
@@ -1675,8 +1675,6 @@ ipsec_chkreplay(seq, sav)
u_int32_t wsizeb; /* constant: bits of window size */
int frlast; /* constant: last frame */
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
IPSEC_ASSERT(sav != NULL, ("Null SA"));
IPSEC_ASSERT(sav->replay != NULL, ("Null replay state"));
@@ -1735,8 +1733,6 @@ ipsec_updatereplay(seq, sav)
u_int32_t wsizeb; /* constant: bits of window size */
int frlast; /* constant: last frame */
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
IPSEC_ASSERT(sav != NULL, ("Null SA"));
IPSEC_ASSERT(sav->replay != NULL, ("Null replay state"));
diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h
index caaf42a..6c7e4fb 100644
--- a/sys/netipsec/ipsec.h
+++ b/sys/netipsec/ipsec.h
@@ -47,7 +47,6 @@
#ifdef _KERNEL
-#define IPSEC_SPLASSERT_SOFTNET(_m) /* XXX-BZ remove me */
#define IPSEC_ASSERT(_c,_m) KASSERT(_c, _m)
#define IPSEC_IS_PRIVILEGED_SO(_so) \
diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c
index 63677ec..e98f71e 100644
--- a/sys/netipsec/ipsec_input.c
+++ b/sys/netipsec/ipsec_input.c
@@ -288,8 +288,6 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav,
#endif
#endif
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
IPSEC_ASSERT(m != NULL, ("null mbuf"));
IPSEC_ASSERT(sav != NULL, ("null SA"));
IPSEC_ASSERT(sav->sah != NULL, ("null SAH"));
diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c
index a8656ef..ea153d4 100644
--- a/sys/netipsec/ipsec_output.c
+++ b/sys/netipsec/ipsec_output.c
@@ -91,8 +91,6 @@ ipsec_process_done(struct mbuf *m, struct ipsecrequest *isr)
struct secasindex *saidx;
int error;
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
IPSEC_ASSERT(m != NULL, ("null mbuf"));
IPSEC_ASSERT(isr != NULL, ("null ISR"));
sav = isr->sav;
@@ -205,7 +203,6 @@ ipsec_nextisr(
isr->saidx.proto == IPPROTO_AH ? (y)++ : (z)++)
struct secasvar *sav;
- IPSEC_SPLASSERT_SOFTNET(__func__);
IPSECREQUEST_LOCK_ASSERT(isr);
IPSEC_ASSERT(af == AF_INET || af == AF_INET6,
diff --git a/sys/netipsec/xform_ah.c b/sys/netipsec/xform_ah.c
index 99236a8..2424b4a 100644
--- a/sys/netipsec/xform_ah.c
+++ b/sys/netipsec/xform_ah.c
@@ -561,8 +561,6 @@ ah_input(struct mbuf *m, struct secasvar *sav, int skip, int protoff)
struct cryptodesc *crda;
struct cryptop *crp;
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
IPSEC_ASSERT(sav != NULL, ("null SA"));
IPSEC_ASSERT(sav->key_auth != NULL, ("null authentication key"));
IPSEC_ASSERT(sav->tdb_authalgxform != NULL,
@@ -895,8 +893,6 @@ ah_output(
u_int8_t prot;
struct newah *ah;
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
sav = isr->sav;
IPSEC_ASSERT(sav != NULL, ("null SA"));
ahx = sav->tdb_authalgxform;
diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c
index 1900980..7e25da0 100644
--- a/sys/netipsec/xform_esp.c
+++ b/sys/netipsec/xform_esp.c
@@ -277,8 +277,6 @@ esp_input(struct mbuf *m, struct secasvar *sav, int skip, int protoff)
struct cryptodesc *crde;
struct cryptop *crp;
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
IPSEC_ASSERT(sav != NULL, ("null SA"));
IPSEC_ASSERT(sav->tdb_encalgxform != NULL, ("null encoding xform"));
IPSEC_ASSERT((skip&3) == 0 && (m->m_pkthdr.len&3) == 0,
@@ -667,8 +665,6 @@ esp_output(
struct cryptodesc *crde = NULL, *crda = NULL;
struct cryptop *crp;
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
sav = isr->sav;
IPSEC_ASSERT(sav != NULL, ("null SA"));
esph = sav->tdb_authalgxform;
diff --git a/sys/netipsec/xform_ipcomp.c b/sys/netipsec/xform_ipcomp.c
index 142a731..97f4827 100644
--- a/sys/netipsec/xform_ipcomp.c
+++ b/sys/netipsec/xform_ipcomp.c
@@ -141,8 +141,6 @@ ipcomp_input(struct mbuf *m, struct secasvar *sav, int skip, int protoff)
struct cryptop *crp;
int hlen = IPCOMP_HLENGTH;
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
/* Get crypto descriptors */
crp = crypto_getreq(1);
if (crp == NULL) {
@@ -338,8 +336,6 @@ ipcomp_output(
struct mbuf *mo;
struct ipcomp *ipcomp;
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
sav = isr->sav;
IPSEC_ASSERT(sav != NULL, ("null SA"));
ipcompx = sav->tdb_compalgxform;
diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c
index e0f54f5..4e8495b 100644
--- a/sys/netipsec/xform_ipip.c
+++ b/sys/netipsec/xform_ipip.c
@@ -418,8 +418,6 @@ ipip_output(
struct ip6_hdr *ip6, *ip6o;
#endif /* INET6 */
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
sav = isr->sav;
IPSEC_ASSERT(sav != NULL, ("null SA"));
IPSEC_ASSERT(sav->sah != NULL, ("null SAH"));
OpenPOWER on IntegriCloud