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_input.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_input.c')
-rw-r--r-- | sys/net80211/ieee80211_input.c | 50 |
1 files changed, 3 insertions, 47 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 8209d2e..b2b6368 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -285,53 +285,9 @@ ieee80211_decap(struct ieee80211vap *vap, struct mbuf *m, int hdrlen) } #ifdef ALIGNED_POINTER if (!ALIGNED_POINTER(mtod(m, caddr_t) + sizeof(*eh), uint32_t)) { - struct mbuf *n, *n0, **np; - caddr_t newdata; - int off, pktlen; - - n0 = NULL; - np = &n0; - off = 0; - pktlen = m->m_pkthdr.len; - while (pktlen > off) { - if (n0 == NULL) { - MGETHDR(n, M_DONTWAIT, MT_DATA); - if (n == NULL) { - m_freem(m); - return NULL; - } - M_MOVE_PKTHDR(n, m); - n->m_len = MHLEN; - } else { - MGET(n, M_DONTWAIT, MT_DATA); - if (n == NULL) { - m_freem(m); - m_freem(n0); - return NULL; - } - n->m_len = MLEN; - } - if (pktlen - off >= MINCLSIZE) { - MCLGET(n, M_DONTWAIT); - if (n->m_flags & M_EXT) - n->m_len = n->m_ext.ext_size; - } - if (n0 == NULL) { - newdata = - (caddr_t)ALIGN(n->m_data + sizeof(*eh)) - - sizeof(*eh); - n->m_len -= newdata - n->m_data; - n->m_data = newdata; - } - if (n->m_len > pktlen - off) - n->m_len = pktlen - off; - m_copydata(m, off, n->m_len, mtod(n, caddr_t)); - off += n->m_len; - *np = n; - np = &n->m_next; - } - m_freem(m); - m = n0; + m = ieee80211_realign(vap, m, sizeof(*eh)); + if (m == NULL) + return NULL; } #endif /* ALIGNED_POINTER */ if (llc != NULL) { |