summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-11-20 19:40:41 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-11-25 16:54:26 +0100
commit1b09cd82d8c479700ef6185665839d1020b02519 (patch)
tree6a4996a1c56bce9ff2d34e4c93e13bd03cdbeb76 /net
parent12b5f34d2d5934e998975bbae4e29f81d94052f6 (diff)
downloadlinux-1b09cd82d8c479700ef6185665839d1020b02519.tar.gz
linux-1b09cd82d8c479700ef6185665839d1020b02519.tar.bz2
linux-1b09cd82d8c479700ef6185665839d1020b02519.zip
cfg80211: ignore supported rates for nonexistant bands on scan
Fixes wpa_supplicant p2p_find on 5GHz-only devices Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/nl80211.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index e20c27ff0f14..138dc3bb8b67 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -5349,6 +5349,10 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
err = -EINVAL;
goto out_free;
}
+
+ if (!wiphy->bands[band])
+ continue;
+
err = ieee80211_get_ratemask(wiphy->bands[band],
nla_data(attr),
nla_len(attr),