From efd2bb9032766c9fab3d0969852630104d66eaac Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sun, 16 Mar 2008 18:42:44 +0100 Subject: [PATCH] --- yaml --- r: 90315 b: refs/heads/master c: fab7d4a2b1d8ce47b69a133f6f9a203b0f12636e h: refs/heads/master i: 90313: 442647fcb4e6373e2f03a7b99ac9307de06b0cfe 90311: 442d9721370e8d6c07a5595d3e2d5113d68dac0d v: v3 --- [refs] | 2 +- trunk/net/mac80211/ieee80211_sta.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 001d9b0460ae..a7d18be78d34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e048c6e4fdac9be0dbcb7e0c5d518737c867ef09 +refs/heads/master: fab7d4a2b1d8ce47b69a133f6f9a203b0f12636e diff --git a/trunk/net/mac80211/ieee80211_sta.c b/trunk/net/mac80211/ieee80211_sta.c index 8b991ebcbb4e..86da69f44384 100644 --- a/trunk/net/mac80211/ieee80211_sta.c +++ b/trunk/net/mac80211/ieee80211_sta.c @@ -2356,6 +2356,7 @@ static void ieee80211_rx_bss_info(struct net_device *dev, struct sta_info *sta; struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); u64 beacon_timestamp, rx_timestamp; + struct ieee80211_channel *channel; DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac2); @@ -2420,6 +2421,11 @@ static void ieee80211_rx_bss_info(struct net_device *dev, else freq = rx_status->freq; + channel = ieee80211_get_channel(local->hw.wiphy, freq); + + if (!channel || channel->flags & IEEE80211_CHAN_DISABLED) + return; + #ifdef CONFIG_MAC80211_MESH if (elems.mesh_config) bss = ieee80211_rx_mesh_bss_get(dev, elems.mesh_id,