diff options
author | sam <sam@FreeBSD.org> | 2009-07-18 20:19:53 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2009-07-18 20:19:53 +0000 |
commit | c70ad2698e22375c9f47db2c3e6a5ee7f3fc937c (patch) | |
tree | 8baf10048cb5037506a7d77ca47bebe123dc1343 /sys/net80211/ieee80211_freebsd.c | |
parent | 630d769cdb32ec5f2d2fd6e11a19a5328c322a45 (diff) | |
download | FreeBSD-src-c70ad2698e22375c9f47db2c3e6a5ee7f3fc937c.zip FreeBSD-src-c70ad2698e22375c9f47db2c3e6a5ee7f3fc937c.tar.gz |
Move code that does payload realigment to a new routine, ieee80211_realign,
so it can be reused. While here rewrite the logic to always use a single mbuf.
Reviewed by: rpaulo
Approved by: re (kib)
Diffstat (limited to 'sys/net80211/ieee80211_freebsd.c')
-rw-r--r-- | sys/net80211/ieee80211_freebsd.c | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index ee3022f..51a86fd 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include <net/route.h> #include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_input.h> SYSCTL_NODE(_net, OID_AUTO, wlan, CTLFLAG_RD, 0, "IEEE 80211 parameters"); @@ -408,6 +409,43 @@ ieee80211_getmgtframe(uint8_t **frm, int headroom, int pktlen) return m; } +/* + * Re-align the payload in the mbuf. This is mainly used (right now) + * to handle IP header alignment requirements on certain architectures. + */ +struct mbuf * +ieee80211_realign(struct ieee80211vap *vap, struct mbuf *m, size_t align) +{ + int pktlen, space; + struct mbuf *n; + + pktlen = m->m_pkthdr.len; + space = pktlen + align; + if (space < MINCLSIZE) + n = m_gethdr(M_DONTWAIT, MT_DATA); + else { + n = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, + space <= MCLBYTES ? MCLBYTES : +#if MJUMPAGESIZE != MCLBYTES + space <= MJUMPAGESIZE ? MJUMPAGESIZE : +#endif + space <= MJUM9BYTES ? MJUM9BYTES : MJUM16BYTES); + } + if (__predict_true(n != NULL)) { + m_move_pkthdr(n, m); + n->m_data = (caddr_t)(ALIGN(n->m_data + align) - align); + m_copydata(m, 0, pktlen, mtod(n, caddr_t)); + n->m_len = pktlen; + } else { + IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, + mtod(m, const struct ieee80211_frame *), NULL, + "%s", "no mbuf to realign"); + vap->iv_stats.is_rx_badalign++; + } + m_freem(m); + return n; +} + int ieee80211_add_callback(struct mbuf *m, void (*func)(struct ieee80211_node *, void *, int), void *arg) |