cfg80211: move all regulatory hints to workqueue

All regulatory hints (core, driver, userspace and 11d) are now processed in
a workqueue.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 9 insertions, 5 deletions

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index b47cbe9e7a5a..1e3824215ac9 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -1656,8 +1656,12 @@ int ath_attach(u16 devid, struct ath_softc *sc)
 
         error = ieee80211_register_hw(hw);
 
-        if (!ath9k_is_world_regd(sc->sc_ah))
-                regulatory_hint(hw->wiphy, sc->sc_ah->regulatory.alpha2);
+        if (!ath9k_is_world_regd(sc->sc_ah)) {
+                error = regulatory_hint(hw->wiphy,
+                        sc->sc_ah->regulatory.alpha2);
+                if (error)
+                        goto error_attach;
+        }
 
         /* Initialize LED control */
         ath_init_leds(sc);
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 7579af27edbd..da9214e33a5f 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -170,10 +170,10 @@ int zd_mac_init_hw(struct ieee80211_hw *hw)
                 goto disable_int;
 
         r = zd_reg2alpha2(mac->regdomain, alpha2);
-        if (!r)
-                regulatory_hint(hw->wiphy, alpha2);
+        if (r)
+                goto disable_int;
 
-        r = 0;
+        r = regulatory_hint(hw->wiphy, alpha2);
 disable_int:
         zd_chip_disable_int(chip);
 out: