| ieee80211_freebsd.c (257176) | ieee80211_freebsd.c (276692) |
|---|---|
| 1/*- 2 * Copyright (c) 2003-2009 Sam Leffler, Errno Consulting 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 10 unchanged lines hidden (view full) --- 19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 */ 25 26#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2003-2009 Sam Leffler, Errno Consulting 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 10 unchanged lines hidden (view full) --- 19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 */ 25 26#include <sys/cdefs.h> |
| 27__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_freebsd.c 257176 2013-10-26 17:58:36Z glebius $"); | 27__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_freebsd.c 276692 2015-01-05 09:58:32Z rwatson $"); |
| 28 29/* 30 * IEEE 802.11 support (FreeBSD-specific code) 31 */ 32#include "opt_wlan.h" 33 34#include <sys/param.h> 35#include <sys/kernel.h> --- 379 unchanged lines hidden (view full) --- 415 m = m_gethdr(M_NOWAIT, MT_DATA); 416 /* 417 * Align the data in case additional headers are added. 418 * This should only happen when a WEP header is added 419 * which only happens for shared key authentication mgt 420 * frames which all fit in MHLEN. 421 */ 422 if (m != NULL) | 28 29/* 30 * IEEE 802.11 support (FreeBSD-specific code) 31 */ 32#include "opt_wlan.h" 33 34#include <sys/param.h> 35#include <sys/kernel.h> --- 379 unchanged lines hidden (view full) --- 415 m = m_gethdr(M_NOWAIT, MT_DATA); 416 /* 417 * Align the data in case additional headers are added. 418 * This should only happen when a WEP header is added 419 * which only happens for shared key authentication mgt 420 * frames which all fit in MHLEN. 421 */ 422 if (m != NULL) |
| 423 MH_ALIGN(m, len); | 423 M_ALIGN(m, len); |
| 424 } else { 425 m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); 426 if (m != NULL) 427 MC_ALIGN(m, len); 428 } 429 if (m != NULL) { 430 m->m_data += headroom; 431 *frm = m->m_data; --- 490 unchanged lines hidden --- | 424 } else { 425 m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); 426 if (m != NULL) 427 MC_ALIGN(m, len); 428 } 429 if (m != NULL) { 430 m->m_data += headroom; 431 *frm = m->m_data; --- 490 unchanged lines hidden --- |