| ieee80211_input.c (167442) | ieee80211_input.c (170360) |
|---|---|
| 1/*- 2 * Copyright (c) 2001 Atsushi Onoe | 1/*- 2 * Copyright (c) 2001 Atsushi Onoe |
| 3 * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting | 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: 9 * 1. Redistributions of source code must retain the above copyright 10 * notice, this list of conditions and the following disclaimer. 11 * 2. Redistributions in binary form must reproduce the above copyright 12 * notice, this list of conditions and the following disclaimer in the 13 * documentation and/or other materials provided with the distribution. | 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: 9 * 1. Redistributions of source code must retain the above copyright 10 * notice, this list of conditions and the following disclaimer. 11 * 2. Redistributions in binary form must reproduce the above copyright 12 * notice, this list of conditions and the following disclaimer in the 13 * documentation and/or other materials provided with the distribution. |
| 14 * 3. The name of the author may not be used to endorse or promote products 15 * derived from this software without specific prior written permission. | |
| 16 * | 14 * |
| 17 * Alternatively, this software may be distributed under the terms of the 18 * GNU General Public License ("GPL") version 2 as published by the Free 19 * Software Foundation. 20 * | |
| 21 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 22 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 23 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 24 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 25 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 31 */ 32 33#include <sys/cdefs.h> | 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 17 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 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> |
| 34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 167442 2007-03-11 07:22:21Z sam $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 170360 2007-06-06 04:56:04Z sam $"); |
| 35 36#include <sys/param.h> 37#include <sys/systm.h> 38#include <sys/mbuf.h> 39#include <sys/malloc.h> 40#include <sys/endian.h> 41#include <sys/kernel.h> 42 --- 638 unchanged lines hidden (view full) --- 681 } else { 682 ic->ic_stats.is_rx_unauth++; 683 IEEE80211_NODE_STAT(sta, rx_unauth); 684 } 685 ieee80211_free_node(sta); 686 } 687 } 688 if (m1 != NULL) | 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 --- 638 unchanged lines hidden (view full) --- 675 } else { 676 ic->ic_stats.is_rx_unauth++; 677 IEEE80211_NODE_STAT(sta, rx_unauth); 678 } 679 ieee80211_free_node(sta); 680 } 681 } 682 if (m1 != NULL) |
| 689 IF_HANDOFF(&ifp->if_snd, m1, ifp); | 683 (void) IF_HANDOFF(&ifp->if_snd, m1, ifp); |
| 690 } 691 if (m != NULL) { 692 m->m_pkthdr.rcvif = ifp; 693 if (ni->ni_vlan != 0) { 694 /* attach vlan tag */ 695 m->m_pkthdr.ether_vtag = ni->ni_vlan; 696 m->m_flags |= M_VLANTAG; 697 } --- 2198 unchanged lines hidden --- | 684 } 685 if (m != NULL) { 686 m->m_pkthdr.rcvif = ifp; 687 if (ni->ni_vlan != 0) { 688 /* attach vlan tag */ 689 m->m_pkthdr.ether_vtag = ni->ni_vlan; 690 m->m_flags |= M_VLANTAG; 691 } --- 2198 unchanged lines hidden --- |