commit 4b42aab1e8fcac2e9b835a7d93bf30dc9a032faa
author Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de> Mon Jul 08 16:55:57 2013 +0200
committer Johannes Berg <johannes.berg@intel.com> Tue Jul 16 09:58:10 2013 +0300
tree d725ba14d8bc8a4498ee71054e0d03163dcae2e9
parent 7ca15a0ae865067aac8d36e27e0acbe4a8f1e70a

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>

net/mac80211/ibss.c

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 @@
 
 	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;
 	}