| ieee80211_input.c (121181) | ieee80211_input.c (124543) |
|---|---|
| 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002, 2003 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: --- 17 unchanged lines hidden (view full) --- 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> | 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002, 2003 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: --- 17 unchanged lines hidden (view full) --- 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> |
| 34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 121181 2003-10-17 23:59:11Z sam $"); | 34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 124543 2004-01-15 08:44:27Z onoe $"); |
| 35 36#include "opt_inet.h" 37 38#include <sys/param.h> 39#include <sys/systm.h> 40#include <sys/mbuf.h> 41#include <sys/malloc.h> 42#include <sys/kernel.h> --- 609 unchanged lines hidden (view full) --- 652 isclr(ic->ic_chan_active, chan)) { 653 IEEE80211_DPRINTF(("%s: ignore %s with invalid channel " 654 "%u\n", __func__, 655 ISPROBE(subtype) ? "probe response" : "beacon", 656 chan)); 657 ic->ic_stats.is_rx_badchan++; 658 return; 659 } | 35 36#include "opt_inet.h" 37 38#include <sys/param.h> 39#include <sys/systm.h> 40#include <sys/mbuf.h> 41#include <sys/malloc.h> 42#include <sys/kernel.h> --- 609 unchanged lines hidden (view full) --- 652 isclr(ic->ic_chan_active, chan)) { 653 IEEE80211_DPRINTF(("%s: ignore %s with invalid channel " 654 "%u\n", __func__, 655 ISPROBE(subtype) ? "probe response" : "beacon", 656 chan)); 657 ic->ic_stats.is_rx_badchan++; 658 return; 659 } |
| 660 if (chan != bchan) { | 660 if (chan != bchan && ic->ic_phytype != IEEE80211_T_FH) { |
| 661 /* 662 * Frame was received on a channel different from the | 661 /* 662 * Frame was received on a channel different from the |
| 663 * one indicated in the DS/FH params element id; | 663 * one indicated in the DS params element id; |
| 664 * silently discard it. 665 * 666 * NB: this can happen due to signal leakage. | 664 * silently discard it. 665 * 666 * NB: this can happen due to signal leakage. |
| 667 * But we should take it for FH phy because 668 * the rssi value should be correct even for 669 * different hop pattern in FH. |
|
| 667 */ 668 IEEE80211_DPRINTF(("%s: ignore %s on channel %u marked " 669 "for channel %u\n", __func__, 670 ISPROBE(subtype) ? "probe response" : "beacon", 671 bchan, chan)); 672 ic->ic_stats.is_rx_chanmismatch++; 673 return; 674 } --- 496 unchanged lines hidden --- | 670 */ 671 IEEE80211_DPRINTF(("%s: ignore %s on channel %u marked " 672 "for channel %u\n", __func__, 673 ISPROBE(subtype) ? "probe response" : "beacon", 674 bchan, chan)); 675 ic->ic_stats.is_rx_chanmismatch++; 676 return; 677 } --- 496 unchanged lines hidden --- |