X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/57962f80aecf03c023853992fea471246a0adc3a..8a27f1c965140ec72dd069582960c64ba9ecf534:/sys/net/bridge/if_bridge.c

diff --git a/sys/net/bridge/if_bridge.c b/sys/net/bridge/if_bridge.c
index d945bd2b32..2a23d159d7 100644
--- a/sys/net/bridge/if_bridge.c
+++ b/sys/net/bridge/if_bridge.c
@@ -1347,7 +1347,7 @@ bridge_ioctl_gifs(struct bridge_softc *sc, void *arg)
 	len = min(bifc->ifbic_len, sizeof(*breq) * count);
 	KKASSERT(len >= sizeof(*breq));
 
-	breq = kmalloc(len, M_TEMP, M_INTWAIT | M_NULLOK | M_ZERO);
+	breq = kmalloc(len, M_TEMP, M_WAITOK | M_NULLOK | M_ZERO);
 	if (breq == NULL) {
 		bifc->ifbic_len = 0;
 		return ENOMEM;
@@ -1415,7 +1415,7 @@ bridge_ioctl_rts(struct bridge_softc *sc, void *arg)
 	len = min(bac->ifbac_len, sizeof(*bareq) * count);
 	KKASSERT(len >= sizeof(*bareq));
 
-	bareq = kmalloc(len, M_TEMP, M_INTWAIT | M_NULLOK | M_ZERO);
+	bareq = kmalloc(len, M_TEMP, M_WAITOK | M_NULLOK | M_ZERO);
 	if (bareq == NULL) {
 		bac->ifbac_len = 0;
 		return ENOMEM;
@@ -1822,7 +1822,6 @@ void
 bridge_enqueue(struct ifnet *dst_ifp, struct mbuf *m)
 {
 	struct netmsg_packet *nmp;
-	lwkt_port_t port;
 
 	nmp = &m->m_hdr.mh_netmsg;
 	netmsg_init(&nmp->nm_netmsg, &netisr_apanic_rport, 0,
@@ -1830,11 +1829,7 @@ bridge_enqueue(struct ifnet *dst_ifp, struct mbuf *m)
 	nmp->nm_packet = m;
 	nmp->nm_netmsg.nm_lmsg.u.ms_resultp = dst_ifp;
 
-	if (curthread->td_flags & TDF_NETWORK)
-		port = &curthread->td_msgport;
-	else
-		port = cpu_portfn(mycpuid);
-	lwkt_sendmsg(port, &nmp->nm_netmsg.nm_lmsg);
+	lwkt_sendmsg(curnetport, &nmp->nm_netmsg.nm_lmsg);
 }
 
 /*