From 1a0004fdf1b1d2346651d9e45bf46ef6088310dd Mon Sep 17 00:00:00 2001 From: sephe Date: Tue, 28 Nov 2006 14:44:03 +0000 Subject: [PATCH] M_NOWAIT -> MB_DONTWAIT --- sys/net/rtsock.c | 4 ++-- sys/netproto/802_11/wlan/ieee80211_dragonfly.c | 6 +++--- sys/netproto/802_11/wlan/ieee80211_input.c | 4 ++-- sys/netproto/802_11/wlan/ieee80211_output.c | 6 +++--- sys/netproto/802_11/wlan_ccmp/ieee80211_crypto_ccmp.c | 4 ++-- sys/netproto/802_11/wlan_tkip/ieee80211_crypto_tkip.c | 4 ++-- sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 8a58ce5b9f..f55f6a3f17 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -82,7 +82,7 @@ * * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 * $FreeBSD: src/sys/net/rtsock.c,v 1.44.2.11 2002/12/04 14:05:41 ru Exp $ - * $DragonFly: src/sys/net/rtsock.c,v 1.35 2006/10/23 09:27:37 swildner Exp $ + * $DragonFly: src/sys/net/rtsock.c,v 1.36 2006/11/28 14:44:03 sephe Exp $ */ #include "opt_sctp.h" @@ -1100,7 +1100,7 @@ rt_ieee80211msg(struct ifnet *ifp, int what, void *data, size_t data_len) * NB: we assume m is a single mbuf. */ if (data_len > M_TRAILINGSPACE(m)) { - struct mbuf *n = m_get(M_NOWAIT, MT_DATA); + struct mbuf *n = m_get(MB_DONTWAIT, MT_DATA); if (n == NULL) { m_freem(m); return; diff --git a/sys/netproto/802_11/wlan/ieee80211_dragonfly.c b/sys/netproto/802_11/wlan/ieee80211_dragonfly.c index e2875b1be6..cd461937b7 100644 --- a/sys/netproto/802_11/wlan/ieee80211_dragonfly.c +++ b/sys/netproto/802_11/wlan/ieee80211_dragonfly.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.7.2.2 2005/12/22 19:22:51 sam Exp $ - * $DragonFly: src/sys/netproto/802_11/wlan/ieee80211_dragonfly.c,v 1.5 2006/11/13 12:27:23 sephe Exp $ + * $DragonFly: src/sys/netproto/802_11/wlan/ieee80211_dragonfly.c,v 1.6 2006/11/28 14:44:03 sephe Exp $ */ /* @@ -180,7 +180,7 @@ ieee80211_getmgtframe(uint8_t **frm, u_int pktlen) len = roundup(sizeof(struct ieee80211_frame) + pktlen, 4); KASSERT(len <= MCLBYTES, ("802.11 mgt frame too large: %u", len)); if (len < MINCLSIZE) { - m = m_gethdr(M_NOWAIT, MT_HEADER); + m = m_gethdr(MB_DONTWAIT, MT_HEADER); /* * Align the data in case additional headers are added. * This should only happen when a WEP header is added @@ -190,7 +190,7 @@ ieee80211_getmgtframe(uint8_t **frm, u_int pktlen) if (m != NULL) MH_ALIGN(m, len); } else - m = m_getcl(M_NOWAIT, MT_HEADER, M_PKTHDR); + m = m_getcl(MB_DONTWAIT, MT_HEADER, M_PKTHDR); if (m != NULL) { m->m_data += sizeof(struct ieee80211_frame); *frm = m->m_data; diff --git a/sys/netproto/802_11/wlan/ieee80211_input.c b/sys/netproto/802_11/wlan/ieee80211_input.c index c1d3c00626..e85aa13a7b 100644 --- a/sys/netproto/802_11/wlan/ieee80211_input.c +++ b/sys/netproto/802_11/wlan/ieee80211_input.c @@ -30,7 +30,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.62.2.14 2006/09/02 15:16:12 sam Exp $ - * $DragonFly: src/sys/netproto/802_11/wlan/ieee80211_input.c,v 1.9 2006/11/26 02:12:34 sephe Exp $ + * $DragonFly: src/sys/netproto/802_11/wlan/ieee80211_input.c,v 1.10 2006/11/28 14:44:03 sephe Exp $ */ #include @@ -1749,7 +1749,7 @@ ieee80211_deliver_l2uf(struct ieee80211_node *ni) struct l2_update_frame *l2uf; struct ether_header *eh; - m = m_gethdr(M_NOWAIT, MT_DATA); + m = m_gethdr(MB_DONTWAIT, MT_DATA); if (m == NULL) { IEEE80211_NOTE(ic, IEEE80211_MSG_ASSOC, ni, "%s", "no mbuf for l2uf frame"); diff --git a/sys/netproto/802_11/wlan/ieee80211_output.c b/sys/netproto/802_11/wlan/ieee80211_output.c index 86d5cede01..2420dff971 100644 --- a/sys/netproto/802_11/wlan/ieee80211_output.c +++ b/sys/netproto/802_11/wlan/ieee80211_output.c @@ -30,7 +30,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.26.2.8 2006/09/02 15:06:04 sam Exp $ - * $DragonFly: src/sys/netproto/802_11/wlan/ieee80211_output.c,v 1.4 2006/11/25 08:56:29 sephe Exp $ + * $DragonFly: src/sys/netproto/802_11/wlan/ieee80211_output.c,v 1.5 2006/11/28 14:44:03 sephe Exp $ */ #include "opt_inet.h" @@ -219,7 +219,7 @@ ieee80211_send_nulldata(struct ieee80211_node *ni) struct mbuf *m; struct ieee80211_frame *wh; - MGETHDR(m, M_NOWAIT, MT_HEADER); + MGETHDR(m, MB_DONTWAIT, MT_HEADER); if (m == NULL) { /* XXX debug msg */ ic->ic_stats.is_tx_nobuf++; @@ -412,7 +412,7 @@ ieee80211_mbuf_adjust(struct ieee80211com *ic, int hdrsize, */ /* XXX check trailing space and copy instead? */ if (M_LEADINGSPACE(m) < needed_space - TO_BE_RECLAIMED) { - struct mbuf *n = m_gethdr(M_NOWAIT, m->m_type); + struct mbuf *n = m_gethdr(MB_DONTWAIT, m->m_type); if (n == NULL) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_OUTPUT, "%s: cannot expand storage\n", __func__); diff --git a/sys/netproto/802_11/wlan_ccmp/ieee80211_crypto_ccmp.c b/sys/netproto/802_11/wlan_ccmp/ieee80211_crypto_ccmp.c index bb29ec2991..34be844e51 100644 --- a/sys/netproto/802_11/wlan_ccmp/ieee80211_crypto_ccmp.c +++ b/sys/netproto/802_11/wlan_ccmp/ieee80211_crypto_ccmp.c @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/net80211/ieee80211_crypto_ccmp.c,v 1.7.2.1 2005/12/22 19:02:08 sam Exp $ - * $DragonFly: src/sys/netproto/802_11/wlan_ccmp/ieee80211_crypto_ccmp.c,v 1.2 2006/09/05 00:55:48 dillon Exp $ + * $DragonFly: src/sys/netproto/802_11/wlan_ccmp/ieee80211_crypto_ccmp.c,v 1.3 2006/11/28 14:44:03 sephe Exp $ */ /* @@ -154,7 +154,7 @@ ccmp_encap(struct ieee80211_key *k, struct mbuf *m, uint8_t keyid) /* * Copy down 802.11 header and add the IV, KeyID, and ExtIV. */ - M_PREPEND(m, ccmp.ic_header, M_NOWAIT); + M_PREPEND(m, ccmp.ic_header, MB_DONTWAIT); if (m == NULL) return 0; ivp = mtod(m, uint8_t *); diff --git a/sys/netproto/802_11/wlan_tkip/ieee80211_crypto_tkip.c b/sys/netproto/802_11/wlan_tkip/ieee80211_crypto_tkip.c index b493a5516f..296d69d28d 100644 --- a/sys/netproto/802_11/wlan_tkip/ieee80211_crypto_tkip.c +++ b/sys/netproto/802_11/wlan_tkip/ieee80211_crypto_tkip.c @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/net80211/ieee80211_crypto_tkip.c,v 1.9.2.2 2005/12/22 19:02:08 sam Exp $ - * $DragonFly: src/sys/netproto/802_11/wlan_tkip/ieee80211_crypto_tkip.c,v 1.2 2006/09/05 00:55:49 dillon Exp $ + * $DragonFly: src/sys/netproto/802_11/wlan_tkip/ieee80211_crypto_tkip.c,v 1.3 2006/11/28 14:44:03 sephe Exp $ */ /* @@ -178,7 +178,7 @@ tkip_encap(struct ieee80211_key *k, struct mbuf *m, uint8_t keyid) /* * Copy down 802.11 header and add the IV, KeyID, and ExtIV. */ - M_PREPEND(m, tkip.ic_header, M_NOWAIT); + M_PREPEND(m, tkip.ic_header, MB_DONTWAIT); if (m == NULL) return 0; ivp = mtod(m, uint8_t *); diff --git a/sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c b/sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c index 303523ae04..66147f25af 100644 --- a/sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c +++ b/sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/net80211/ieee80211_crypto_wep.c,v 1.7.2.1 2005/12/22 19:02:08 sam Exp $ - * $DragonFly: src/sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c,v 1.2 2006/09/05 00:55:49 dillon Exp $ + * $DragonFly: src/sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c,v 1.3 2006/11/28 14:44:03 sephe Exp $ */ /* @@ -136,7 +136,7 @@ wep_encap(struct ieee80211_key *k, struct mbuf *m, uint8_t keyid) /* * Copy down 802.11 header and add the IV + KeyID. */ - M_PREPEND(m, wep.ic_header, M_NOWAIT); + M_PREPEND(m, wep.ic_header, MB_DONTWAIT); if (m == NULL) return 0; ivp = mtod(m, uint8_t *); -- 2.11.4.GIT