diff options
| author | andre <andre@FreeBSD.org> | 2005-11-02 13:46:32 +0000 |
|---|---|---|
| committer | andre <andre@FreeBSD.org> | 2005-11-02 13:46:32 +0000 |
| commit | 0df84f5a83def3e1548e39bb43b0c177d50265fa (patch) | |
| tree | 7cfb57b5672b497ffd3064153c31cb0a738e8f19 /sys/net80211 | |
| parent | 728b935c7f99f10947da6d54873e625c1a7a69c7 (diff) | |
| download | FreeBSD-src-0df84f5a83def3e1548e39bb43b0c177d50265fa.zip FreeBSD-src-0df84f5a83def3e1548e39bb43b0c177d50265fa.tar.gz | |
Retire MT_HEADER mbuf type and change its users to use MT_DATA.
Having an additional MT_HEADER mbuf type is superfluous and redundant
as nothing depends on it. It only adds a layer of confusion. The
distinction between header mbuf's and data mbuf's is solely done
through the m->m_flags M_PKTHDR flag.
Non-native code is not changed in this commit. For compatibility
MT_HEADER is mapped to MT_DATA.
Sponsored by: TCP/IP Optimization Fundraise 2005
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_freebsd.c | 4 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_output.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index dd37250..e05744a 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -170,7 +170,7 @@ ieee80211_getmgtframe(u_int8_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(M_NOWAIT, MT_DATA); /* * Align the data in case additional headers are added. * This should only happen when a WEP header is added @@ -180,7 +180,7 @@ ieee80211_getmgtframe(u_int8_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(M_NOWAIT, MT_DATA, M_PKTHDR); if (m != NULL) { m->m_data += sizeof(struct ieee80211_frame); *frm = m->m_data; diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index b6c1586..70baf8d 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -212,7 +212,7 @@ ieee80211_send_nulldata(struct ieee80211_node *ni) struct mbuf *m; struct ieee80211_frame *wh; - MGETHDR(m, M_NOWAIT, MT_HEADER); + MGETHDR(m, M_NOWAIT, MT_DATA); if (m == NULL) { /* XXX debug msg */ ic->ic_stats.is_tx_nobuf++; |
