aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath9k/main.c2
-rw-r--r--drivers/net/wireless/ath9k/regd.c1
2 files changed, 1 insertions, 2 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)
1670 } 1670 }
1671 wiphy_apply_custom_regulatory(hw->wiphy, regd); 1671 wiphy_apply_custom_regulatory(hw->wiphy, regd);
1672 ath9k_reg_apply_radar_flags(hw->wiphy); 1672 ath9k_reg_apply_radar_flags(hw->wiphy);
1673 ath9k_reg_apply_world_flags(hw->wiphy, REGDOM_SET_BY_INIT); 1673 ath9k_reg_apply_world_flags(hw->wiphy, REGDOM_SET_BY_DRIVER);
1674 1674
1675 INIT_WORK(&sc->chan_work, ath9k_wiphy_chan_work); 1675 INIT_WORK(&sc->chan_work, ath9k_wiphy_chan_work);
1676 INIT_DELAYED_WORK(&sc->wiphy_work, ath9k_wiphy_work); 1676 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)
341 341
342 switch (request->initiator) { 342 switch (request->initiator) {
343 case REGDOM_SET_BY_DRIVER: 343 case REGDOM_SET_BY_DRIVER:
344 case REGDOM_SET_BY_INIT:
345 case REGDOM_SET_BY_CORE: 344 case REGDOM_SET_BY_CORE:
346 case REGDOM_SET_BY_USER: 345 case REGDOM_SET_BY_USER:
347 break; 346 break;