| ieee80211_sta.c (196783) | ieee80211_sta.c (202967) |
|---|---|
| 1/*- 2 * Copyright (c) 2007-2008 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 --- 11 unchanged lines hidden (view full) --- 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#ifdef __FreeBSD__ | 1/*- 2 * Copyright (c) 2007-2008 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 --- 11 unchanged lines hidden (view full) --- 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#ifdef __FreeBSD__ |
| 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_sta.c 196783 2009-09-03 16:24:21Z sam $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_sta.c 202967 2010-01-25 12:23:51Z rpaulo $"); |
| 29#endif 30 31/* 32 * IEEE 802.11 Station mode support. 33 */ 34#include "opt_inet.h" 35#include "opt_wlan.h" 36 --- 717 unchanged lines hidden (view full) --- 754 ni->ni_macaddr, "data", "%s", "demic error"); 755 vap->iv_stats.is_rx_demicfail++; 756 IEEE80211_NODE_STAT(ni, rx_demicfail); 757 goto out; 758 } 759 760 /* copy to listener after decrypt */ 761 if (ieee80211_radiotap_active_vap(vap)) | 29#endif 30 31/* 32 * IEEE 802.11 Station mode support. 33 */ 34#include "opt_inet.h" 35#include "opt_wlan.h" 36 --- 717 unchanged lines hidden (view full) --- 754 ni->ni_macaddr, "data", "%s", "demic error"); 755 vap->iv_stats.is_rx_demicfail++; 756 IEEE80211_NODE_STAT(ni, rx_demicfail); 757 goto out; 758 } 759 760 /* copy to listener after decrypt */ 761 if (ieee80211_radiotap_active_vap(vap)) |
| 762 ieee80211_radiotap_tx(vap, m); | 762 ieee80211_radiotap_rx(vap, m); |
| 763 need_tap = 0; 764 765 /* 766 * Finally, strip the 802.11 header. 767 */ 768 m = ieee80211_decap(vap, m, hdrspace); 769 if (m == NULL) { 770 /* XXX mask bit to check for both */ --- 973 unchanged lines hidden --- | 763 need_tap = 0; 764 765 /* 766 * Finally, strip the 802.11 header. 767 */ 768 m = ieee80211_decap(vap, m, hdrspace); 769 if (m == NULL) { 770 /* XXX mask bit to check for both */ --- 973 unchanged lines hidden --- |