mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-02 08:42:48 +00:00
Code Issues Releases Activity

In addition to the ipsec_osdep.h removal a week ago, now also eliminate

Browse Source 
IPSEC_SPLASSERT_SOFTNET which has been 'unused' since FreeBSD 5.0.
This commit is contained in:
Bjoern A. Zeeb 2008-05-24 15:32:46 +00:00
parent 9a38ba8101
commit eaa9325f48
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=179290
8 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/netipsec/ipsec.c
View File

@ -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"));

1
sys/netipsec/ipsec.h
View File

@ -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) \

2
sys/netipsec/ipsec_input.c
View File

@ -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"));

3
sys/netipsec/ipsec_output.c
View File

@ -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,

4
sys/netipsec/xform_ah.c
View File

@ -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;

4
sys/netipsec/xform_esp.c
View File

@ -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;

4
sys/netipsec/xform_ipcomp.c
View File

@ -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;

2
sys/netipsec/xform_ipip.c
View File

@ -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"));