Commit fab7d4a2 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

mac80211: filter scan results on unusable channels

When you have an AP on channel 13, it will currently often enough
be listed in scan results even when the regulatory domain restricts
to channels 1-11. This is due to channel overlap. To avoid getting
very strange failures, don't show such APs in the scan results. The
failure mode will now go from "I can see the AP but not associate"
to "I can't see the AP although I know it's there" which is easier
to debug.

This problem was first really noticed by Jes Sorensen.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Cc: Jes Sorensen <jes@trained-monkey.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e048c6e4
...@@ -2356,6 +2356,7 @@ static void ieee80211_rx_bss_info(struct net_device *dev, ...@@ -2356,6 +2356,7 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
struct sta_info *sta; struct sta_info *sta;
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
u64 beacon_timestamp, rx_timestamp; u64 beacon_timestamp, rx_timestamp;
struct ieee80211_channel *channel;
DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac);
DECLARE_MAC_BUF(mac2); DECLARE_MAC_BUF(mac2);
...@@ -2420,6 +2421,11 @@ static void ieee80211_rx_bss_info(struct net_device *dev, ...@@ -2420,6 +2421,11 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
else else
freq = rx_status->freq; freq = rx_status->freq;
channel = ieee80211_get_channel(local->hw.wiphy, freq);
if (!channel || channel->flags & IEEE80211_CHAN_DISABLED)
return;
#ifdef CONFIG_MAC80211_MESH #ifdef CONFIG_MAC80211_MESH
if (elems.mesh_config) if (elems.mesh_config)
bss = ieee80211_rx_mesh_bss_get(dev, elems.mesh_id, bss = ieee80211_rx_mesh_bss_get(dev, elems.mesh_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment