summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-06-18 12:31:56 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-06-18 21:11:14 +0200
commit8223d2f540c96f46f762fbd93f59a08bb80601c1 (patch)
treef17ae4a2290c80e90b84a42d4ccf221dfd643ac8
parentwireless: move regulatory_init to .init.text (diff)
downloadlinux-8223d2f540c96f46f762fbd93f59a08bb80601c1.tar.xz
linux-8223d2f540c96f46f762fbd93f59a08bb80601c1.zip
mac80211_hwsim: fix fake_hw_scan
Since mac80211 will not set the max_scan parameters if hw scan is enabled, hwsim needs to do it so that cfg80211 won't reject the scan. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/mac80211_hwsim.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 6f8cb3ee6fed..af50895e4bb0 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -1291,6 +1291,11 @@ static int __init init_mac80211_hwsim(void)
hw->wiphy->n_addresses = 2;
hw->wiphy->addresses = data->addresses;
+ if (fake_hw_scan) {
+ hw->wiphy->max_scan_ssids = 255;
+ hw->wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN;
+ }
+
hw->channel_change_time = 1;
hw->queues = 4;
hw->wiphy->interface_modes =