summaryrefslogtreecommitdiffstats
path: root/sys/net80211/ieee80211_superg.c
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2012-12-05 08:04:20 +0000
committerglebius <glebius@FreeBSD.org>2012-12-05 08:04:20 +0000
commit8e20fa5ae93243e19700ca06c01524b90fe3b784 (patch)
treebf083a0829f8044362fc83354c8e8b60d1f7932a /sys/net80211/ieee80211_superg.c
parentd0604243f84872a5dd39fc735ebcdb4fbe1b6bb5 (diff)
downloadFreeBSD-src-8e20fa5ae93243e19700ca06c01524b90fe3b784.zip
FreeBSD-src-8e20fa5ae93243e19700ca06c01524b90fe3b784.tar.gz
Mechanically substitute flags from historic mbuf allocator with
malloc(9) flags within sys. Exceptions: - sys/contrib not touched - sys/mbuf.h edited manually
Diffstat (limited to 'sys/net80211/ieee80211_superg.c')
-rw-r--r--sys/net80211/ieee80211_superg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211_superg.c b/sys/net80211/ieee80211_superg.c
index 172c1f9..a061929 100644
--- a/sys/net80211/ieee80211_superg.c
+++ b/sys/net80211/ieee80211_superg.c
@@ -352,7 +352,7 @@ ff_encap1(struct ieee80211vap *vap, struct mbuf *m,
llc->llc_snap.ether_type = eh->ether_type;
payload = m->m_pkthdr.len; /* NB: w/o Ethernet header */
- M_PREPEND(m, sizeof(struct ether_header), M_DONTWAIT);
+ M_PREPEND(m, sizeof(struct ether_header), M_NOWAIT);
if (m == NULL) { /* XXX cannot happen */
IEEE80211_DPRINTF(vap, IEEE80211_MSG_SUPERG,
"%s: no space for ether_header\n", __func__);
@@ -460,7 +460,7 @@ ieee80211_ff_encap(struct ieee80211vap *vap, struct mbuf *m1, int hdrspace,
*/
m->m_next = m2; /* NB: last mbuf from above */
m1->m_pkthdr.len += m2->m_pkthdr.len;
- M_PREPEND(m1, sizeof(uint32_t)+2, M_DONTWAIT);
+ M_PREPEND(m1, sizeof(uint32_t)+2, M_NOWAIT);
if (m1 == NULL) { /* XXX cannot happen */
IEEE80211_DPRINTF(vap, IEEE80211_MSG_SUPERG,
"%s: no space for tunnel header\n", __func__);
@@ -469,7 +469,7 @@ ieee80211_ff_encap(struct ieee80211vap *vap, struct mbuf *m1, int hdrspace,
}
memset(mtod(m1, void *), 0, sizeof(uint32_t)+2);
- M_PREPEND(m1, sizeof(struct llc), M_DONTWAIT);
+ M_PREPEND(m1, sizeof(struct llc), M_NOWAIT);
if (m1 == NULL) { /* XXX cannot happen */
IEEE80211_DPRINTF(vap, IEEE80211_MSG_SUPERG,
"%s: no space for llc header\n", __func__);
OpenPOWER on IntegriCloud