diff options
-rw-r--r-- | drivers/net/wireless/ath9k/main.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath9k/regd.c | 1 | ||||
-rw-r--r-- | include/net/cfg80211.h | 3 | ||||
-rw-r--r-- | net/wireless/reg.c | 2 |
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) | |||
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; |
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 { | |||
350 | 350 | ||
351 | /** | 351 | /** |
352 | * enum reg_set_by - Indicates who is trying to set the regulatory domain | 352 | * enum reg_set_by - Indicates who is trying to set the regulatory domain |
353 | * @REGDOM_SET_BY_INIT: regulatory domain was set by initialization. We will be | ||
354 | * using a static world regulatory domain by default. | ||
355 | * @REGDOM_SET_BY_CORE: Core queried CRDA for a dynamic world regulatory domain. | 353 | * @REGDOM_SET_BY_CORE: Core queried CRDA for a dynamic world regulatory domain. |
356 | * @REGDOM_SET_BY_USER: User asked the wireless core to set the | 354 | * @REGDOM_SET_BY_USER: User asked the wireless core to set the |
357 | * regulatory domain. | 355 | * regulatory domain. |
@@ -362,7 +360,6 @@ struct bss_parameters { | |||
362 | * should consider. | 360 | * should consider. |
363 | */ | 361 | */ |
364 | enum reg_set_by { | 362 | enum reg_set_by { |
365 | REGDOM_SET_BY_INIT, | ||
366 | REGDOM_SET_BY_CORE, | 363 | REGDOM_SET_BY_CORE, |
367 | REGDOM_SET_BY_USER, | 364 | REGDOM_SET_BY_USER, |
368 | REGDOM_SET_BY_DRIVER, | 365 | 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, | |||
1255 | return 0; | 1255 | return 0; |
1256 | 1256 | ||
1257 | switch (pending_request->initiator) { | 1257 | switch (pending_request->initiator) { |
1258 | case REGDOM_SET_BY_INIT: | ||
1259 | return -EINVAL; | ||
1260 | case REGDOM_SET_BY_CORE: | 1258 | case REGDOM_SET_BY_CORE: |
1261 | return -EINVAL; | 1259 | return -EINVAL; |
1262 | case REGDOM_SET_BY_COUNTRY_IE: | 1260 | case REGDOM_SET_BY_COUNTRY_IE: |