diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-11-12 10:51:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 11:34:35 -0800 |
| commit | 7e2c753a06883b35bf627c13211785b15002de0f (patch) | |
| tree | 133a0864b8a73b147510fa6874559e9b8de125e3 /net/wireless | |
| parent | b67793df3809f589e8cbd2c1a277d29c60e7dd1d (diff) | |
| download | kernel_samsung_smdk4412-7e2c753a06883b35bf627c13211785b15002de0f.zip kernel_samsung_smdk4412-7e2c753a06883b35bf627c13211785b15002de0f.tar.gz kernel_samsung_smdk4412-7e2c753a06883b35bf627c13211785b15002de0f.tar.bz2 | |
wireless: allow 40 MHz on world roaming channels 12/13
commit 43c771a1963ab461a2f194e3c97fded1d5fe262f upstream.
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.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/reg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index d85a149..aec54df 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -125,9 +125,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 |