Commit 43c771a1 authored Nov 12, 2012 by Johannes Berg

wireless: allow 40 MHz on world roaming channels 12/13



When in world roaming mode, allow 40 MHz to be used
on channels 12 and 13 so that an AP that is, e.g.,
using HT40+ on channel 9 (in the UK) can be used.

Cc: stable@vger.kernel.org
Reported-by: Eddie Chapman <eddie@ehuk.net>
Tested-by: Eddie Chapman <eddie@ehuk.net>
Acked-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 1f98ab7f

net/wireless/reg.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -141,9 +141,8 @@ static const struct ieee80211_regdomain world_regdom = {
		.reg_rules = {
		/* IEEE 802.11b/g, channels 1..11 */
		REG_RULE(2412-10, 2462+10, 40, 6, 20, 0),
		/* IEEE 802.11b/g, channels 12..13. No HT40
		* channel fits here. */
		REG_RULE(2467-10, 2472+10, 20, 6, 20,
		/* IEEE 802.11b/g, channels 12..13. */
		REG_RULE(2467-10, 2472+10, 40, 6, 20,
		NL80211_RRF_PASSIVE_SCAN \|
		NL80211_RRF_NO_IBSS),
		/* IEEE 802.11 channel 14 - Only JP enables