Merge pull request #580 from wigyori/cc-libpcap

[15.05/openwrt.git] / package / kernel / mac80211 / patches / 402-ath_regd_optional.patch

diff --git a/package/kernel/mac80211/patches/402-ath_regd_optional.patch b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
index 42260fc..7351353 100644 (file)
--- a/package/kernel/mac80211/patches/402-ath_regd_optional.patch
+++ b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
@@ -33,22 +33,23 @@
        if (!wiphy->bands[IEEE80211_BAND_5GHZ])
                return;
  
-@@ -631,6 +643,10 @@ ath_regd_init_wiphy(struct ath_regulator
- {
+@@ -633,6 +645,11 @@ ath_regd_init_wiphy(struct ath_regulator
        const struct ieee80211_regdomain *regd;
  
+       wiphy->reg_notifier = reg_notifier;
++
 +#ifdef CPTCFG_ATH_USER_REGD
 +      return 0;
 +#endif
 +
-       wiphy->reg_notifier = reg_notifier;
        wiphy->regulatory_flags |= REGULATORY_STRICT_REG |
                                   REGULATORY_CUSTOM_REG;
+ 
 --- a/drivers/net/wireless/ath/Kconfig
 +++ b/drivers/net/wireless/ath/Kconfig
-@@ -21,6 +21,9 @@ menuconfig ATH_CARDS
+@@ -23,6 +23,9 @@ config WLAN_VENDOR_ATH
  
- if ATH_CARDS
+ if WLAN_VENDOR_ATH
  
 +config ATH_USER_REGD
 +      bool "Do not enforce EEPROM regulatory restrictions"
@@ -58,9 +59,9 @@
        ---help---
 --- a/.local-symbols
 +++ b/.local-symbols
-@@ -112,6 +112,7 @@ RTL8187_LEDS=
+@@ -125,6 +125,7 @@ ADM8211=
  ATH_COMMON=
- ATH_CARDS=
+ WLAN_VENDOR_ATH=
  ATH_DEBUG=
 +ATH_USER_REGD=
  ATH_TRACEPOINTS=