4 files changed, 1 insertions, 7 deletions

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 5268697be79d..1d6b05c0d800 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -1670,7 +1670,7 @@ int ath_attach(u16 devid, struct ath_softc *sc)
         }
         wiphy_apply_custom_regulatory(hw->wiphy, regd);
         ath9k_reg_apply_radar_flags(hw->wiphy);
-        ath9k_reg_apply_world_flags(hw->wiphy, REGDOM_SET_BY_INIT);
+        ath9k_reg_apply_world_flags(hw->wiphy, REGDOM_SET_BY_DRIVER);
 
         INIT_WORK(&sc->chan_work, ath9k_wiphy_chan_work);
         INIT_DELAYED_WORK(&sc->wiphy_work, ath9k_wiphy_work);
diff --git a/drivers/net/wireless/ath9k/regd.c b/drivers/net/wireless/ath9k/regd.c
index 639da975bf54..ff0afc02f3ce 100644
--- a/drivers/net/wireless/ath9k/regd.c
+++ b/drivers/net/wireless/ath9k/regd.c
@@ -341,7 +341,6 @@ int ath9k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)
 
         switch (request->initiator) {
         case REGDOM_SET_BY_DRIVER:
-        case REGDOM_SET_BY_INIT:
         case REGDOM_SET_BY_CORE:
         case REGDOM_SET_BY_USER:
                 break;
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 75fa556728ce..f195ea460811 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -350,8 +350,6 @@ struct bss_parameters {
 
 /**
  * enum reg_set_by - Indicates who is trying to set the regulatory domain
- * @REGDOM_SET_BY_INIT: regulatory domain was set by initialization. We will be
- *      using a static world regulatory domain by default.
  * @REGDOM_SET_BY_CORE: Core queried CRDA for a dynamic world regulatory domain.
  * @REGDOM_SET_BY_USER: User asked the wireless core to set the
  *      regulatory domain.
@@ -362,7 +360,6 @@ struct bss_parameters {
  *      should consider.
  */
 enum reg_set_by {
-        REGDOM_SET_BY_INIT,
         REGDOM_SET_BY_CORE,
         REGDOM_SET_BY_USER,
         REGDOM_SET_BY_DRIVER,
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index fa738be897a3..47ff44751b70 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1255,8 +1255,6 @@ static int ignore_request(struct wiphy *wiphy,
                 return 0;
 
         switch (pending_request->initiator) {
-        case REGDOM_SET_BY_INIT:
-                return -EINVAL;
         case REGDOM_SET_BY_CORE:
                 return -EINVAL;
         case REGDOM_SET_BY_COUNTRY_IE: