summaryrefslogtreecommitdiffstats
path: root/net/mac80211/ibss.c
diff options
context:
space:
mode:
authorSimon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de>2013-07-08 16:55:57 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-07-16 09:58:10 +0300
commit4b42aab1e8fcac2e9b835a7d93bf30dc9a032faa (patch)
treed725ba14d8bc8a4498ee71054e0d03163dcae2e9 /net/mac80211/ibss.c
parent7ca15a0ae865067aac8d36e27e0acbe4a8f1e70a (diff)
downloadop-kernel-dev-4b42aab1e8fcac2e9b835a7d93bf30dc9a032faa.zip
op-kernel-dev-4b42aab1e8fcac2e9b835a7d93bf30dc9a032faa.tar.gz
mac80211: return if IBSS chandef can not be used
This was originally designed to fail when a 40+/40- mode can not be used, but basic modes (such as 5/10/20 MHz) must be handled with an error. Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r--net/mac80211/ibss.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 8fa1c27..449702d 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -85,6 +85,14 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
chandef = ifibss->chandef;
if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef)) {
+ if (chandef.width == NL80211_CHAN_WIDTH_5 ||
+ chandef.width == NL80211_CHAN_WIDTH_10 ||
+ chandef.width == NL80211_CHAN_WIDTH_20_NOHT ||
+ chandef.width == NL80211_CHAN_WIDTH_20) {
+ sdata_info(sdata,
+ "Failed to join IBSS, beacons forbidden\n");
+ return;
+ }
chandef.width = NL80211_CHAN_WIDTH_20;
chandef.center_freq1 = chan->center_freq;
}
OpenPOWER on IntegriCloud