| ieee80211_input.c (173273) | ieee80211_input.c (175939) |
|---|---|
| 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 11 unchanged lines hidden (view full) --- 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 11 unchanged lines hidden (view full) --- 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 173273 2007-11-02 05:22:25Z sam $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 175939 2008-02-03 12:00:03Z sephe $"); |
| 29 30#include <sys/param.h> 31#include <sys/systm.h> 32#include <sys/mbuf.h> 33#include <sys/malloc.h> 34#include <sys/endian.h> 35#include <sys/kernel.h> 36 --- 720 unchanged lines hidden (view full) --- 757 } 758 } else { 759 ic->ic_stats.is_rx_unauth++; 760 IEEE80211_NODE_STAT(sta, rx_unauth); 761 } 762 ieee80211_free_node(sta); 763 } 764 } | 29 30#include <sys/param.h> 31#include <sys/systm.h> 32#include <sys/mbuf.h> 33#include <sys/malloc.h> 34#include <sys/endian.h> 35#include <sys/kernel.h> 36 --- 720 unchanged lines hidden (view full) --- 757 } 758 } else { 759 ic->ic_stats.is_rx_unauth++; 760 IEEE80211_NODE_STAT(sta, rx_unauth); 761 } 762 ieee80211_free_node(sta); 763 } 764 } |
| 765 if (m1 != NULL) 766 (void) IF_HANDOFF(&ifp->if_snd, m1, ifp); | 765 if (m1 != NULL) { 766 int error; 767 768 /* XXX does not work well with WME */ 769 IFQ_HANDOFF(ifp, m1, error); 770 } |
| 767 } 768 if (m != NULL) { 769 m->m_pkthdr.rcvif = ifp; 770 if (ni->ni_vlan != 0) { 771 /* attach vlan tag */ 772 m->m_pkthdr.ether_vtag = ni->ni_vlan; 773 m->m_flags |= M_VLANTAG; 774 } --- 2655 unchanged lines hidden --- | 771 } 772 if (m != NULL) { 773 m->m_pkthdr.rcvif = ifp; 774 if (ni->ni_vlan != 0) { 775 /* attach vlan tag */ 776 m->m_pkthdr.ether_vtag = ni->ni_vlan; 777 m->m_flags |= M_VLANTAG; 778 } --- 2655 unchanged lines hidden --- |