diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-28 23:33:53 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-28 23:33:53 -0500 |
| commit | 32034e0580a9cd8cebd303ced20f54c06cb24f4d (patch) | |
| tree | ec0076ab74f5b46413851897a4ded6d1f51a7ba5 /net/wireless/reg.c | |
| parent | 06615bed60c1fb7c37adddb75bdc80da873b5edb (diff) | |
| parent | 9c1c98a3bb7b7593b60264b9a07e001e68b46697 (diff) | |
Merge tag 'mac80211-for-davem-2015-02-27' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A few patches have accumulated, among them the fix for Linus's
four-way-handshake problem. The others are various small fixes
for problems all over, nothing really stands out.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index b586d0dcb09e..48dfc7b4e981 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -228,7 +228,7 @@ static DECLARE_DELAYED_WORK(reg_timeout, reg_timeout_work); /* We keep a static world regulatory domain in case of the absence of CRDA */ static const struct ieee80211_regdomain world_regdom = { - .n_reg_rules = 6, + .n_reg_rules = 8, .alpha2 = "00", .reg_rules = { /* IEEE 802.11b/g, channels 1..11 */ |