kernel: update linux 3.2 to 3.2.9

[openwrt.git] / package / mac80211 / patches / 405-world_regd_fixup.patch

diff --git a/package/mac80211/patches/405-world_regd_fixup.patch b/package/mac80211/patches/405-world_regd_fixup.patch
index 48ca03f..027b55c 100644 (file)
--- a/package/mac80211/patches/405-world_regd_fixup.patch
+++ b/package/mac80211/patches/405-world_regd_fixup.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/regd.c
 +++ b/drivers/net/wireless/ath/regd.c
-@@ -37,7 +37,8 @@
+@@ -40,7 +40,8 @@ static int __ath_regd_init(struct ath_re
                                NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_OFDM)
  
  /* We allow IBSS on these on a case by case basis by regulatory domain */
@@ -10,7 +10,7 @@
                                NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
  #define ATH9K_5GHZ_5470_5850  REG_RULE(5470-10, 5850+10, 40, 0, 30,\
                                NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
-@@ -55,57 +56,56 @@
+@@ -58,57 +59,56 @@ static int __ath_regd_init(struct ath_re
  #define ATH9K_5GHZ_NO_MIDBAND ATH9K_5GHZ_5150_5350, \
                                ATH9K_5GHZ_5725_5850
  
@@ -68,8 +68,8 @@
 +      )
  };
  
- /* Can be used by 0x67, 0x6A and 0x68 */
- static const struct ieee80211_regdomain ath_world_regdom_67_68_6A = {
+ /* Can be used by 0x67, 0x68, 0x6A and 0x6C */
+ static const struct ieee80211_regdomain ath_world_regdom_67_68_6A_6C = {
 -      .n_reg_rules = 4,
        .alpha2 =  "99",
 -      .reg_rules = {