I insisted we keep this macro to differentiate which code has been
audited and really need the NET_LOCK() until we were ready to switch.
This time has come, so I'd like to replace all of them. This will
allow us to get rid of the SPL dance altogether and turn the NET_LOCK()
free of any argument.
This requires the NET_LOCK() diff sent earlier, ok?
diff --git sys/net/bfd.c sys/net/bfd.c
index 560bab52728..69600b73359 100644
--- sys/net/bfd.c
+++ sys/net/bfd.c
@@ -236,8 +236,6 @@ bfd_clear_task(void *arg)
struct rtentry *rt = (struct rtentry *)arg;
struct bfd_config *bfd;
- splsoftassert(IPL_SOFTNET);
-
if ((bfd = bfd_lookup(rt)) == NULL)
return;
diff --git sys/net/bridgestp.c sys/net/bridgestp.c
index dec7b86836c..38271cb4770 100644
--- sys/net/bridgestp.c
+++ sys/net/bridgestp.c
@@ -1584,7 +1584,7 @@ bstp_notify_rtage(struct bstp_port *bp, int pending)
{
int age = 0;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
switch (bp->bp_protover) {
case BSTP_PROTO_STP:
diff --git sys/net/if.c sys/net/if.c
index 41e2d9a2747..5ef1b5717d2 100644
--- sys/net/if.c
+++ sys/net/if.c
@@ -410,7 +410,7 @@ if_attachsetup(struct ifnet *ifp)
{
unsigned long ifidx;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
TAILQ_INIT(&ifp->if_groups);
@@ -1143,7 +1143,7 @@ if_clone_create(const char *name, int rdomain)
struct ifnet *ifp;
int unit, ret;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
ifc = if_clone_lookup(name, &unit);
if (ifc == NULL)
@@ -1177,7 +1177,7 @@ if_clone_destroy(const char *name)
struct ifnet *ifp;
int ret;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
ifc = if_clone_lookup(name, NULL);
if (ifc == NULL)
@@ -1516,7 +1516,7 @@ if_downall(void)
void
if_down(struct ifnet *ifp)
{
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
ifp->if_flags &= ~IFF_UP;
getmicrotime(&ifp->if_lastchange);
@@ -1532,7 +1532,7 @@ if_down(struct ifnet *ifp)
void
if_up(struct ifnet *ifp)
{
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
ifp->if_flags |= IFF_UP;
getmicrotime(&ifp->if_lastchange);
diff --git sys/net/if_bridge.c sys/net/if_bridge.c
index 377f6f5d074..f167098a521 100644
--- sys/net/if_bridge.c
+++ sys/net/if_bridge.c
@@ -1469,7 +1469,7 @@ bridge_ipsec(struct bridge_softc *sc, struct ifnet *ifp,
break;
}
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
tdb = gettdb(ifp->if_rdomain, spi, &dst, proto);
if (tdb != NULL && (tdb->tdb_flags & TDBF_INVALID) == 0 &&
diff --git sys/net/if_pfsync.c sys/net/if_pfsync.c
index 9a1f3c44589..8757fd0ae30 100644
--- sys/net/if_pfsync.c
+++ sys/net/if_pfsync.c
@@ -1180,7 +1180,7 @@ pfsync_update_net_tdb(struct pfsync_tdb *pt)
{
struct tdb *tdb;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/* check for invalid values */
if (ntohl(pt->spi) <= SPI_RESERVED_MAX ||
@@ -1686,7 +1686,7 @@ pfsync_insert_state(struct pf_state *st)
{
struct pfsync_softc *sc = pfsyncif;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (ISSET(st->rule.ptr->rule_flag, PFRULE_NOSYNC) ||
st->key[PF_SK_WIRE]->proto == IPPROTO_PFSYNC) {
@@ -1716,7 +1716,7 @@ pfsync_defer(struct pf_state *st, struct mbuf *m)
struct pfsync_softc *sc = pfsyncif;
struct pfsync_deferral *pd;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (!sc->sc_defer ||
ISSET(st->state_flags, PFSTATE_NOSYNC) ||
@@ -1756,7 +1756,7 @@ pfsync_undefer(struct pfsync_deferral *pd, int drop)
struct pfsync_softc *sc = pfsyncif;
struct pf_pdesc pdesc;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
TAILQ_REMOVE(&sc->sc_deferrals, pd, pd_entry);
sc->sc_deferred--;
@@ -1821,7 +1821,7 @@ pfsync_deferred(struct pf_state *st, int drop)
struct pfsync_softc *sc = pfsyncif;
struct pfsync_deferral *pd;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
TAILQ_FOREACH(pd, &sc->sc_deferrals, pd_entry) {
if (pd->pd_st == st) {
@@ -1840,7 +1840,7 @@ pfsync_update_state(struct pf_state *st)
struct pfsync_softc *sc = pfsyncif;
int sync = 0;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (sc == NULL || !ISSET(sc->sc_if.if_flags, IFF_RUNNING))
return;
@@ -2009,7 +2009,7 @@ pfsync_delete_state(struct pf_state *st)
{
struct pfsync_softc *sc = pfsyncif;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (sc == NULL || !ISSET(sc->sc_if.if_flags, IFF_RUNNING))
return;
@@ -2056,7 +2056,7 @@ pfsync_clear_states(u_int32_t creatorid, const char
*ifname)
struct pfsync_clr clr;
} __packed r;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (sc == NULL || !ISSET(sc->sc_if.if_flags, IFF_RUNNING))
return;
diff --git sys/net/if_ppp.c sys/net/if_ppp.c
index e8444a42ab7..ac912e1a8c2 100644
--- sys/net/if_ppp.c
+++ sys/net/if_ppp.c
@@ -992,7 +992,7 @@ pppintr(void)
struct ppp_pkt *pkt;
struct mbuf *m;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
LIST_FOREACH(sc, &ppp_softc_list, sc_list) {
if (!(sc->sc_flags & SC_TBUSY) &&
diff --git sys/net/if_pppoe.c sys/net/if_pppoe.c
index 51a7b5746b4..b50c7bf921e 100644
--- sys/net/if_pppoe.c
+++ sys/net/if_pppoe.c
@@ -344,7 +344,7 @@ pppoeintr(void)
{
struct mbuf *m;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
while ((m = niq_dequeue(&pppoediscinq)) != NULL)
pppoe_disc_input(m);
diff --git sys/net/pf.c sys/net/pf.c
index 7ccb88e859e..1108a45abde 100644
--- sys/net/pf.c
+++ sys/net/pf.c
@@ -895,7 +895,7 @@ int
pf_state_insert(struct pfi_kif *kif, struct pf_state_key **skw,
struct pf_state_key **sks, struct pf_state *s)
{
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
s->kif = kif;
if (*skw == *sks) {
@@ -1275,7 +1275,7 @@ pf_src_tree_remove_state(struct pf_state *s)
void
pf_remove_state(struct pf_state *cur)
{
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/* handle load balancing related tasks */
pf_postprocess_addr(cur);
diff --git sys/net/pf_if.c sys/net/pf_if.c
index 5069e85519a..1ec344d9828 100644
--- sys/net/pf_if.c
+++ sys/net/pf_if.c
@@ -594,7 +594,7 @@ pfi_kifaddr_update(void *v)
{
struct pfi_kif *kif = (struct pfi_kif *)v;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
pfi_update++;
pfi_kif_update(kif);
diff --git sys/net/pfkey.c sys/net/pfkey.c
index 0f77d2d8654..f4c86d74047 100644
--- sys/net/pfkey.c
+++ sys/net/pfkey.c
@@ -137,7 +137,7 @@ pfkey_sendup(struct socket *socket, struct mbuf *packet,
int more)
{
struct mbuf *packet2;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (more) {
if (!(packet2 = m_dup_pkt(packet, 0, M_DONTWAIT)))
diff --git sys/net/pfkeyv2.c sys/net/pfkeyv2.c
index b56010365dd..f88437a117d 100644
--- sys/net/pfkeyv2.c
+++ sys/net/pfkeyv2.c
@@ -823,7 +823,7 @@ pfkeyv2_send(struct socket *socket, void *message, int len)
u_int rdomain;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/* Verify that we received this over a legitimate pfkeyv2 socket */
bzero(headers, sizeof(headers));
@@ -2168,7 +2168,7 @@ pfkeyv2_ipo_walk(u_int rdomain, int (*walker)(struct
ipsec_policy *, void *),
int rval = 0;
struct ipsec_policy *ipo;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
TAILQ_FOREACH(ipo, &ipsec_policy_head, ipo_list) {
if (ipo->ipo_rdomain != rdomain)
@@ -2245,7 +2245,7 @@ pfkeyv2_sysctl(int *name, u_int namelen, void *oldp,
size_t *oldlenp,
int error = EINVAL;
u_int rdomain;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (new)
return (EPERM);
diff --git sys/net/route.c sys/net/route.c
index ffa4baa21f1..26b9bff0b46 100644
--- sys/net/route.c
+++ sys/net/route.c
@@ -241,7 +241,7 @@ rt_match(struct sockaddr *dst, uint32_t *src, int flags,
unsigned int tableid)
struct rtentry *rt0, *rt = NULL;
int error = 0;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
rt = rtable_match(tableid, dst, src);
if (rt != NULL) {
@@ -833,7 +833,7 @@ rtrequest_delete(struct rt_addrinfo *info, u_int8_t prio,
struct ifnet *ifp,
struct rtentry *rt;
int error;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (!rtable_exists(tableid))
return (EAFNOSUPPORT);
@@ -920,7 +920,7 @@ rtrequest(int req, struct rt_addrinfo *info, u_int8_t prio,
struct sockaddr_mpls *sa_mpls;
#endif
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (!rtable_exists(tableid))
return (EAFNOSUPPORT);
diff --git sys/netinet/igmp.c sys/netinet/igmp.c
index 12b9561b0ec..1a1e99604a9 100644
--- sys/netinet/igmp.c
+++ sys/netinet/igmp.c
@@ -550,7 +550,7 @@ igmp_fasttimo(void)
{
struct ifnet *ifp;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/*
* Quick check to see if any work needs to be done, in order
@@ -571,7 +571,7 @@ igmp_checktimer(struct ifnet *ifp)
struct in_multi *inm;
struct ifmaddr *ifma;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
TAILQ_FOREACH(ifma, &ifp->if_maddrlist, ifma_list) {
if (ifma->ifma_addr->sa_family != AF_INET)
@@ -600,7 +600,7 @@ igmp_slowtimo(void)
{
struct router_info *rti;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
for (rti = rti_head; rti != 0; rti = rti->rti_next) {
if (rti->rti_type == IGMP_v1_ROUTER &&
diff --git sys/netinet/in.c sys/netinet/in.c
index 7a20e768887..97be0d3aac5 100644
--- sys/netinet/in.c
+++ sys/netinet/in.c
@@ -210,7 +210,7 @@ in_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, int
privileged)
int error;
int newifaddr;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) {
if (ifa->ifa_addr->sa_family == AF_INET) {
@@ -600,7 +600,7 @@ in_ifinit(struct ifnet *ifp, struct in_ifaddr *ia, struct
sockaddr_in *sin,
struct sockaddr_in oldaddr;
int error = 0, rterror;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/*
* Always remove the address from the tree to make sure its
@@ -700,7 +700,7 @@ in_purgeaddr(struct ifaddr *ifa)
struct in_ifaddr *ia = ifatoia(ifa);
extern int ifatrash;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
in_ifscrub(ifp, ia);
@@ -798,7 +798,7 @@ in_addmulti(struct in_addr *ap, struct ifnet *ifp)
struct in_multi *inm;
struct ifreq ifr;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/*
* See if address already in list.
@@ -860,7 +860,7 @@ in_delmulti(struct in_multi *inm)
struct ifreq ifr;
struct ifnet *ifp;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (--inm->inm_refcnt == 0) {
/*
diff --git sys/netinet/ip_input.c sys/netinet/ip_input.c
index 780190950cc..eaa03ba8f79 100644
--- sys/netinet/ip_input.c
+++ sys/netinet/ip_input.c
@@ -987,7 +987,7 @@ ip_slowtimo(void)
{
struct ipq *fp, *nfp;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
for (fp = LIST_FIRST(&ipq); fp != NULL; fp = nfp) {
nfp = LIST_NEXT(fp, ipq_q);
diff --git sys/netinet/ip_ipsp.c sys/netinet/ip_ipsp.c
index dd252568ffa..a302992dc13 100644
--- sys/netinet/ip_ipsp.c
+++ sys/netinet/ip_ipsp.c
@@ -211,7 +211,7 @@ reserve_spi(u_int rdomain, u_int32_t sspi, u_int32_t tspi,
u_int32_t spi;
int nums;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/* Don't accept ranges only encompassing reserved SPIs. */
if (sproto != IPPROTO_IPCOMP &&
@@ -306,7 +306,7 @@ gettdb(u_int rdomain, u_int32_t spi, union sockaddr_union
*dst, u_int8_t proto)
u_int32_t hashval;
struct tdb *tdbp;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (tdbh == NULL)
return (struct tdb *) NULL;
@@ -507,7 +507,7 @@ tdb_walk(u_int rdomain, int (*walker)(struct tdb *, void *,
int), void *arg)
int i, rval = 0;
struct tdb *tdbp, *next;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (tdbh == NULL)
return ENOENT;
@@ -605,7 +605,7 @@ tdb_rehash(void)
u_int i, old_hashmask = tdb_hashmask;
u_int32_t hashval;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
tdb_hashmask = (tdb_hashmask << 1) | 1;
@@ -664,7 +664,7 @@ puttdb(struct tdb *tdbp)
{
u_int32_t hashval;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (tdbh == NULL) {
arc4random_buf(&tdbkey, sizeof(tdbkey));
@@ -718,7 +718,7 @@ tdb_delete(struct tdb *tdbp)
struct tdb *tdbpp;
u_int32_t hashval;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (tdbh == NULL)
return;
diff --git sys/netinet/ip_mroute.c sys/netinet/ip_mroute.c
index 047adc9c3a9..c9612e44cbd 100644
--- sys/netinet/ip_mroute.c
+++ sys/netinet/ip_mroute.c
@@ -526,7 +526,7 @@ ip_mrouter_done(struct socket *so)
struct ifnet *ifp;
unsigned int rtableid = inp->inp_rtableid;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/* Delete all remaining installed multicast routes. */
rtable_walk(rtableid, AF_INET, mrouter_rtwalk_delete, NULL);
@@ -650,7 +650,7 @@ add_vif(struct socket *so, struct mbuf *m)
int error;
unsigned int rtableid = inp->inp_rtableid;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (m == NULL || m->m_len < sizeof(struct vifctl))
return (EINVAL);
@@ -713,7 +713,7 @@ del_vif(struct socket *so, struct mbuf *m)
vifi_t *vifip;
unsigned int rtableid = inp->inp_rtableid;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (m == NULL || m->m_len < sizeof(vifi_t))
return (EINVAL);
@@ -938,7 +938,7 @@ add_mfc(struct socket *so, struct mbuf *m)
int mfcctl_size = sizeof(struct mfcctl);
unsigned int rtableid = inp->inp_rtableid;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (mrt_api_config & MRT_API_FLAGS_ALL)
mfcctl_size = sizeof(struct mfcctl2);
@@ -976,7 +976,7 @@ del_mfc(struct socket *so, struct mbuf *m)
struct mfcctl *mp;
unsigned int rtableid = inp->inp_rtableid;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/*
* XXX: for deleting MFC entries the information in entries
diff --git sys/netinet/ipsec_input.c sys/netinet/ipsec_input.c
index 8b275147443..ca899280a81 100644
--- sys/netinet/ipsec_input.c
+++ sys/netinet/ipsec_input.c
@@ -119,7 +119,7 @@ ipsec_common_input(struct mbuf *m, int skip, int protoff,
int af, int sproto,
char buf[INET6_ADDRSTRLEN];
#endif
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
IPSEC_ISTAT(espstat.esps_input, ahstat.ahs_input,
ipcompstat.ipcomps_input);
@@ -799,7 +799,7 @@ udpencap_ctlinput(int cmd, struct sockaddr *sa, u_int
rdomain, void *v)
struct sockaddr_in dst, src;
union sockaddr_union *su_dst, *su_src;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
icp = (struct icmp *)((caddr_t) ip - offsetof(struct icmp, icmp_ip));
mtu = ntohs(icp->icmp_nextmtu);
diff --git sys/netinet/ipsec_output.c sys/netinet/ipsec_output.c
index 686f55c5ae4..6bf76a2107d 100644
--- sys/netinet/ipsec_output.c
+++ sys/netinet/ipsec_output.c
@@ -568,7 +568,7 @@ ipsec_adjust_mtu(struct mbuf *m, u_int32_t mtu)
struct m_tag *mtag;
ssize_t adjust;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
for (mtag = m_tag_find(m, PACKET_TAG_IPSEC_OUT_DONE, NULL); mtag;
mtag = m_tag_find(m, PACKET_TAG_IPSEC_OUT_DONE, mtag)) {
diff --git sys/netinet/tcp_timer.c sys/netinet/tcp_timer.c
index 72854fa11bd..95140356807 100644
--- sys/netinet/tcp_timer.c
+++ sys/netinet/tcp_timer.c
@@ -129,7 +129,7 @@ tcp_delack(void *arg)
void
tcp_slowtimo(void)
{
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
tcp_maxidle = TCPTV_KEEPCNT * tcp_keepintvl;
tcp_iss += TCP_ISSINCR2/PR_SLOWHZ; /* increment iss */
diff --git sys/netinet/tcp_usrreq.c sys/netinet/tcp_usrreq.c
index 1ac6d1322f4..ea5badcd41d 100644
--- sys/netinet/tcp_usrreq.c
+++ sys/netinet/tcp_usrreq.c
@@ -734,7 +734,7 @@ tcp_ident(void *oldp, size_t *oldlenp, void *newp, size_t
newlen, int dodrop)
struct in6_addr f6, l6;
#endif
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (dodrop) {
if (oldp != NULL || *oldlenp != 0)
diff --git sys/netinet6/frag6.c sys/netinet6/frag6.c
index baaec54bab1..30795a9dd68 100644
--- sys/netinet6/frag6.c
+++ sys/netinet6/frag6.c
@@ -603,7 +603,7 @@ frag6_slowtimo(void)
{
struct ip6q *q6, *nq6;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
IP6Q_LOCK();
TAILQ_FOREACH_SAFE(q6, &frag6_queue, ip6q_queue, nq6)
diff --git sys/netinet6/in6.c sys/netinet6/in6.c
index d0fe43f2ad8..00e4ae6bc8d 100644
--- sys/netinet6/in6.c
+++ sys/netinet6/in6.c
@@ -500,7 +500,7 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra,
struct rtentry *rt;
char addr[INET6_ADDRSTRLEN];
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/* Validate parameters */
if (ifp == NULL || ifra == NULL) /* this maybe redundant */
@@ -900,7 +900,7 @@ in6_unlink_ifa(struct in6_ifaddr *ia6, struct ifnet *ifp)
extern int ifatrash;
int plen;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/* Release the reference to the base prefix. */
if (ia6->ia6_ndpr == NULL) {
@@ -1170,7 +1170,7 @@ in6_ifinit(struct ifnet *ifp, struct in6_ifaddr *ia6, int
newhost)
int error = 0, plen, ifacount = 0;
struct ifaddr *ifa;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/*
* Give the interface a chance to initialize
@@ -1226,7 +1226,7 @@ in6_addmulti(struct in6_addr *maddr6, struct ifnet *ifp,
int *errorp)
struct in6_ifreq ifr;
struct in6_multi *in6m;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
*errorp = 0;
/*
@@ -1294,7 +1294,7 @@ in6_delmulti(struct in6_multi *in6m)
struct in6_ifreq ifr;
struct ifnet *ifp;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (--in6m->in6m_refcnt == 0) {
/*
diff --git sys/netinet6/in6_ifattach.c sys/netinet6/in6_ifattach.c
index 8ebd35026f0..58b83333e36 100644
--- sys/netinet6/in6_ifattach.c
+++ sys/netinet6/in6_ifattach.c
@@ -296,7 +296,7 @@ in6_ifattach_linklocal(struct ifnet *ifp, struct in6_addr
*ifid)
struct in6_ifaddr *ia6;
int error, flags;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/*
* configure link-local address.
diff --git sys/netinet6/ip6_mroute.c sys/netinet6/ip6_mroute.c
index 9d87f632e0e..0d0d891d4ce 100644
--- sys/netinet6/ip6_mroute.c
+++ sys/netinet6/ip6_mroute.c
@@ -452,7 +452,7 @@ ip6_mrouter_done(struct socket *so)
struct rtdetq *rte;
unsigned int rtableid = inp->inp_rtableid;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/* Unregister all interfaces in the domain. */
TAILQ_FOREACH(ifp, &ifnet, if_list) {
@@ -543,7 +543,7 @@ add_m6if(struct socket *so, struct mif6ctl *mifcp)
int error;
unsigned int rtableid = inp->inp_rtableid;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (mifcp->mif6c_mifi >= MAXMIFS)
return EINVAL;
@@ -600,7 +600,7 @@ del_m6if(struct socket *so, mifi_t *mifip)
struct inpcb *inp = sotoinpcb(so);
struct ifnet *ifp;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (*mifip >= MAXMIFS)
return EINVAL;
@@ -624,7 +624,7 @@ add_m6fc(struct mf6cctl *mfccp)
u_short nstl;
char orig[INET6_ADDRSTRLEN], mcast[INET6_ADDRSTRLEN];
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
MF6CFIND(mfccp->mf6cc_origin.sin6_addr,
mfccp->mf6cc_mcastgrp.sin6_addr, rt);
@@ -750,7 +750,7 @@ del_m6fc(struct mf6cctl *mfccp)
struct mf6c **nptr;
u_long hash;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
origin = mfccp->mf6cc_origin;
mcastgrp = mfccp->mf6cc_mcastgrp;
@@ -808,7 +808,7 @@ ip6_mforward(struct ip6_hdr *ip6, struct ifnet *ifp, struct
mbuf *m)
struct sockaddr_in6 sin6;
unsigned int rtableid = ifp->if_rdomain;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/*
* Don't forward a packet with Hop limit of zero or one,
@@ -1130,7 +1130,7 @@ phyint_send6(struct ifnet *ifp, struct ip6_hdr *ip6,
struct mbuf *m)
struct sockaddr_in6 *dst6, sin6;
int error = 0;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/*
* Make a new reference to the packet; make sure that
diff --git sys/netinet6/mld6.c sys/netinet6/mld6.c
index 1c9e18399de..67bc5e79fbe 100644
--- sys/netinet6/mld6.c
+++ sys/netinet6/mld6.c
@@ -345,7 +345,7 @@ mld6_checktimer(struct ifnet *ifp)
struct in6_multi *in6m;
struct ifmaddr *ifma;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
TAILQ_FOREACH(ifma, &ifp->if_maddrlist, ifma_list) {
if (ifma->ifma_addr->sa_family != AF_INET6)
diff --git sys/netinet6/nd6.c sys/netinet6/nd6.c
index 8ee5a0c4797..6f0d35a185e 100644
--- sys/netinet6/nd6.c
+++ sys/netinet6/nd6.c
@@ -513,7 +513,7 @@ nd6_purge(struct ifnet *ifp)
struct nd_defrouter *dr, *ndr;
struct nd_prefix *pr, *npr;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/*
* Nuke default router list entries toward ifp.
@@ -746,7 +746,7 @@ nd6_free(struct rtentry *rt, int gc)
struct nd_defrouter *dr;
struct ifnet *ifp;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
ifp = if_get(rt->rt_ifidx);
@@ -1130,7 +1130,7 @@ nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp)
struct rtentry *rt;
int error = 0;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
switch (cmd) {
case SIOCGIFINFO_IN6:
diff --git sys/netinet6/nd6_nbr.c sys/netinet6/nd6_nbr.c
index fef9d7e0a93..0afbfe5e0a6 100644
--- sys/netinet6/nd6_nbr.c
+++ sys/netinet6/nd6_nbr.c
@@ -571,7 +571,7 @@ nd6_na_input(struct mbuf *m, int off, int icmp6len)
union nd_opts ndopts;
char addr[INET6_ADDRSTRLEN], addr0[INET6_ADDRSTRLEN];
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
ifp = if_get(m->m_pkthdr.ph_ifidx);
if (ifp == NULL)
@@ -1099,7 +1099,7 @@ nd6_dad_start(struct ifaddr *ifa)
struct dadq *dp;
char addr[INET6_ADDRSTRLEN];
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (!dad_init) {
TAILQ_INIT(&dadq);
diff --git sys/netinet6/nd6_rtr.c sys/netinet6/nd6_rtr.c
index f340637b55f..908db6ee25b 100644
--- sys/netinet6/nd6_rtr.c
+++ sys/netinet6/nd6_rtr.c
@@ -204,7 +204,7 @@ nd6_rs_output(struct ifnet* ifp, struct in6_ifaddr *ia6)
caddr_t mac;
int icmp6len, maxlen;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
KASSERT(ia6 != NULL);
KASSERT(ifp->if_flags & IFF_RUNNING);
@@ -870,7 +870,7 @@ defrtrlist_update(struct nd_defrouter *new)
struct nd_defrouter *dr, *n;
struct in6_ifextra *ext = new->ifp->if_afdata[AF_INET6];
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if ((dr = defrouter_lookup(&new->rtaddr, new->ifp->if_index)) != NULL) {
/* entry exists */
@@ -1014,7 +1014,7 @@ purge_detached(struct ifnet *ifp)
struct in6_ifaddr *ia6;
struct ifaddr *ifa, *ifa_next;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
LIST_FOREACH_SAFE(pr, &nd_prefix, ndpr_entry, pr_next) {
/*
@@ -1050,7 +1050,7 @@ nd6_prelist_add(struct nd_prefix *pr, struct nd_defrouter
*dr,
struct in6_ifextra *ext = pr->ndpr_ifp->if_afdata[AF_INET6];
int i;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
if (ip6_maxifprefixes >= 0) {
if (ext->nprefixes >= ip6_maxifprefixes / 2) {
@@ -1110,7 +1110,7 @@ prelist_remove(struct nd_prefix *pr)
struct in6_ifextra *ext = pr->ndpr_ifp->if_afdata[AF_INET6];
int e;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/* make sure to invalidate the prefix until it is really freed. */
pr->ndpr_vltime = 0;
@@ -1165,7 +1165,7 @@ prelist_update(struct nd_prefix *new, struct nd_defrouter
*dr, struct mbuf *m)
struct in6_addrlifetime lt6_tmp;
char addr[INET6_ADDRSTRLEN];
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
auth = 0;
if (m) {
@@ -1833,7 +1833,7 @@ in6_ifadd(struct nd_prefix *pr, int privacy)
struct in6_addr mask, rand_ifid;
int prefixlen = pr->ndpr_plen;
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
in6_prefixlen2mask(&mask, prefixlen);
@@ -2014,7 +2014,7 @@ in6_init_address_ltimes(struct nd_prefix *new, struct
in6_addrlifetime *lt6)
void
rt6_flush(struct in6_addr *gateway, struct ifnet *ifp)
{
- splsoftassert(IPL_SOFTNET);
+ NET_ASSERT_LOCKED();
/* We'll care only link-local addresses */
if (!IN6_IS_ADDR_LINKLOCAL(gateway))
