From 9e0afdff34f5bf1d54e74dd9b734243ff92ea92c Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@web.de>
Date: Mon, 30 Mar 2009 22:30:32 -0400
Subject: [PATCH] --- yaml --- r: 149884 b: refs/heads/master c:
 1878f77e13b9d720b78c4f818b94bfd4a7f596e5 h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/net/wireless/ar9170/Kconfig  |  1 +
 trunk/drivers/net/wireless/ar9170/ar9170.h |  3 +++
 trunk/drivers/net/wireless/ar9170/main.c   | 18 ++++++++++++++++++
 trunk/drivers/net/wireless/ath/Kconfig     |  2 +-
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 109d9140fd5a..2d71c5d1b1a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f769c36bd71ebe8d7a5f83764f0428d36ebced35
+refs/heads/master: 1878f77e13b9d720b78c4f818b94bfd4a7f596e5
diff --git a/trunk/drivers/net/wireless/ar9170/Kconfig b/trunk/drivers/net/wireless/ar9170/Kconfig
index de4281fda129..b99e3263ee6d 100644
--- a/trunk/drivers/net/wireless/ar9170/Kconfig
+++ b/trunk/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/trunk/drivers/net/wireless/ar9170/ar9170.h b/trunk/drivers/net/wireless/ar9170/ar9170.h
index f4fb2e94aea0..87c19859ba70 100644
--- a/trunk/drivers/net/wireless/ar9170/ar9170.h
+++ b/trunk/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/trunk/drivers/net/wireless/ar9170/main.c b/trunk/drivers/net/wireless/ar9170/main.c
index 5f55754d968f..8de0ff9f580b 100644
--- a/trunk/drivers/net/wireless/ar9170/main.c
+++ b/trunk/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/trunk/drivers/net/wireless/ath/Kconfig b/trunk/drivers/net/wireless/ath/Kconfig
index c2873a24baae..76517a45a212 100644
--- a/trunk/drivers/net/wireless/ath/Kconfig
+++ b/trunk/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