| ieee80211_input.c (184270) | ieee80211_input.c (186107) |
|---|---|
| 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2008 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-2008 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 184270 2008-10-25 23:26:57Z sam $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 186107 2008-12-15 01:26:33Z sam $"); |
| 29 30#include "opt_wlan.h" 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/mbuf.h> 35#include <sys/malloc.h> 36#include <sys/endian.h> --- 631 unchanged lines hidden (view full) --- 668 * (so callers shouldn't otherwise process the frame). 669 */ 670 IEEE80211_VERIFY_ELEMENT(scan->xrates, 671 IEEE80211_RATE_MAXSIZE - scan->rates[1], 672 scan->status |= IEEE80211_BPARSE_XRATES_INVALID); 673 } 674 IEEE80211_VERIFY_ELEMENT(scan->ssid, IEEE80211_NWID_LEN, 675 scan->status |= IEEE80211_BPARSE_SSID_INVALID); | 29 30#include "opt_wlan.h" 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/mbuf.h> 35#include <sys/malloc.h> 36#include <sys/endian.h> --- 631 unchanged lines hidden (view full) --- 668 * (so callers shouldn't otherwise process the frame). 669 */ 670 IEEE80211_VERIFY_ELEMENT(scan->xrates, 671 IEEE80211_RATE_MAXSIZE - scan->rates[1], 672 scan->status |= IEEE80211_BPARSE_XRATES_INVALID); 673 } 674 IEEE80211_VERIFY_ELEMENT(scan->ssid, IEEE80211_NWID_LEN, 675 scan->status |= IEEE80211_BPARSE_SSID_INVALID); |
| 676#if IEEE80211_CHAN_MAX < 255 677 if (scan->chan > IEEE80211_CHAN_MAX) { 678 IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, 679 wh, NULL, "invalid channel %u", scan->chan); 680 vap->iv_stats.is_rx_badchan++; 681 scan->status |= IEEE80211_BPARSE_CHAN_INVALID; 682 } 683#endif | |
| 684 if (scan->chan != scan->bchan && ic->ic_phytype != IEEE80211_T_FH) { 685 /* 686 * Frame was received on a channel different from the 687 * one indicated in the DS params element id; 688 * silently discard it. 689 * 690 * NB: this can happen due to signal leakage. 691 * But we should take it for FH phy because --- 248 unchanged lines hidden --- | 676 if (scan->chan != scan->bchan && ic->ic_phytype != IEEE80211_T_FH) { 677 /* 678 * Frame was received on a channel different from the 679 * one indicated in the DS params element id; 680 * silently discard it. 681 * 682 * NB: this can happen due to signal leakage. 683 * But we should take it for FH phy because --- 248 unchanged lines hidden --- |