Make ar9170 use common ath reg code

Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ar9170/Kconfig b/drivers/net/wireless/ar9170/Kconfig
index de4281fda12971b27beea2d150f2c620b267c579..b99e3263ee6d9c7074e015bfb33590e7b3a1028a 100644 (file)
--- a/drivers/net/wireless/ar9170/Kconfig
+++ b/drivers/net/wireless/ar9170/Kconfig
@@ -2,6 +2,7 @@ config AR9170_USB
        tristate "Atheros AR9170 802.11n USB support"
        depends on USB && MAC80211 && WLAN_80211 && EXPERIMENTAL
        select FW_LOADER
+       select ATH_COMMON
        help
          This is a driver for the Atheros "otus" 802.11n USB devices.
 

diff --git a/drivers/net/wireless/ar9170/ar9170.h b/drivers/net/wireless/ar9170/ar9170.h
index f4fb2e94aea0588f749f7acbbd1a329d7769baed..87c19859ba701be24d0ec6e0d4bce8f301c98428 100644 (file)
--- a/drivers/net/wireless/ar9170/ar9170.h
+++ b/drivers/net/wireless/ar9170/ar9170.h
@@ -48,6 +48,8 @@
 #include "eeprom.h"
 #include "hw.h"
 
+#include "../ath/regd.h"
+
 #define PAYLOAD_MAX    (AR9170_MAX_CMD_LEN/4 - 1)
 
 enum ar9170_bw {
@@ -151,6 +153,7 @@ struct ar9170 {
 
        /* EEPROM */
        struct ar9170_eeprom eeprom;
+       struct ath_regulatory regulatory;
 
        /* global tx status for unregistered Stations. */
        struct sk_buff_head global_tx_status;

diff --git a/drivers/net/wireless/ar9170/main.c b/drivers/net/wireless/ar9170/main.c
index 5f55754d968fcff7cbfd71b9279d9b4df31d053b..8de0ff9f580b129928a484a78686b040babf7e5b 100644 (file)
--- a/drivers/net/wireless/ar9170/main.c
+++ b/drivers/net/wireless/ar9170/main.c
@@ -1620,12 +1620,24 @@ static int ar9170_read_eeprom(struct ar9170 *ar)
        else
                ar->hw->channel_change_time = 80 * 1000;
 
+       ar->regulatory.current_rd = le16_to_cpu(ar->eeprom.reg_domain[0]);
+       ar->regulatory.current_rd_ext = le16_to_cpu(ar->eeprom.reg_domain[1]);
+
        /* second part of wiphy init */
        SET_IEEE80211_PERM_ADDR(ar->hw, addr);
 
        return bands ? 0 : -EINVAL;
 }
 
+static int ar9170_reg_notifier(struct wiphy *wiphy,
+                       struct regulatory_request *request)
+{
+       struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
+       struct ar9170 *ar = hw->priv;
+
+       return ath_reg_notifier_apply(wiphy, request, &ar->regulatory);
+}
+
 int ar9170_register(struct ar9170 *ar, struct device *pdev)
 {
        int err;
@@ -1635,10 +1647,16 @@ int ar9170_register(struct ar9170 *ar, struct device *pdev)
        if (err)
                goto err_out;
 
+       err = ath_regd_init(&ar->regulatory, ar->hw->wiphy,
+                           ar9170_reg_notifier);
+
        err = ieee80211_register_hw(ar->hw);
        if (err)
                goto err_out;
 
+       if (!ath_is_world_regd(&ar->regulatory))
+               regulatory_hint(ar->hw->wiphy, ar->regulatory.alpha2);
+
        err = ar9170_init_leds(ar);
        if (err)
                goto err_unreg;

diff --git a/drivers/net/wireless/ath/Kconfig b/drivers/net/wireless/ath/Kconfig
index c2873a24baaee60e3415d8d24e48821f86fb95e6..76517a45a212886fee5aa5cce7b4f9ba01a77b5d 100644 (file)
--- a/drivers/net/wireless/ath/Kconfig
+++ b/drivers/net/wireless/ath/Kconfig
@@ -1,4 +1,4 @@
 config ATH_COMMON
        tristate "Atheros Wireless Cards Shared Support"
-       depends on ATH5K || ATH9K
+       depends on ATH5K || ATH9K || AR9170_USB