From 259d36c219fbbaa646eeff3748879cde1f909bc5 Mon Sep 17 00:00:00 2001
From: Sujith <Sujith.Manoharan@atheros.com>
Date: Wed, 29 Oct 2008 10:16:52 +0530
Subject: [PATCH] --- yaml --- r: 121775 b: refs/heads/master c:
 50fdae2c7bcb6417997f90c3d9853a59a9ed06ce h: refs/heads/master i:   121773:
 1cf238c9c4db4e7a7cfed652a7e2c9036a879a4e   121771:
 34756cc8f7cbb50c663d50a42cb26e95a11364c7   121767:
 dbbd26c1c3ab3ded57930db3ddd936d6e7bd84c4   121759:
 3014c54fec379b8655c21d4955836d9f58c17eab v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/net/wireless/ath9k/core.c | 23 -----------------------
 trunk/drivers/net/wireless/ath9k/core.h |  2 --
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index 919787161a24..155ebcb45c42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1dc56003b23d2d5bb5a756de6b1633a76c9e697
+refs/heads/master: 50fdae2c7bcb6417997f90c3d9853a59a9ed06ce
diff --git a/trunk/drivers/net/wireless/ath9k/core.c b/trunk/drivers/net/wireless/ath9k/core.c
index aa1f1fc0886a..b45953f35417 100644
--- a/trunk/drivers/net/wireless/ath9k/core.c
+++ b/trunk/drivers/net/wireless/ath9k/core.c
@@ -17,8 +17,6 @@
 #include "core.h"
 #include "regd.h"
 
-static int ath_outdoor;		/* enable outdoor use */
-
 static u32 ath_chainmask_sel_up_rssi_thres =
 	ATH_CHAINMASK_SEL_UP_RSSI_THRES;
 static u32 ath_chainmask_sel_down_rssi_thres =
@@ -1349,27 +1347,6 @@ void ath_update_txpow(struct ath_softc *sc)
 	}
 }
 
-/* Return the current country and domain information */
-void ath_get_currentCountry(struct ath_softc *sc,
-	struct ath9k_country_entry *ctry)
-{
-	ath9k_regd_get_current_country(sc->sc_ah, ctry);
-
-	/* If HAL not specific yet, since it is band dependent,
-	 * use the one we passed in. */
-	if (ctry->countryCode == CTRY_DEFAULT) {
-		ctry->iso[0] = 0;
-		ctry->iso[1] = 0;
-	} else if (ctry->iso[0] && ctry->iso[1]) {
-		if (!ctry->iso[2]) {
-			if (ath_outdoor)
-				ctry->iso[2] = 'O';
-			else
-				ctry->iso[2] = 'I';
-		}
-	}
-}
-
 /**************************/
 /* Slow Antenna Diversity */
 /**************************/
diff --git a/trunk/drivers/net/wireless/ath9k/core.h b/trunk/drivers/net/wireless/ath9k/core.h
index c03acf7a4900..fdaecb1e326b 100644
--- a/trunk/drivers/net/wireless/ath9k/core.h
+++ b/trunk/drivers/net/wireless/ath9k/core.h
@@ -1018,8 +1018,6 @@ int ath_get_mac80211_qnum(u32 queue, struct ath_softc *sc);
 void ath_setslottime(struct ath_softc *sc);
 void ath_update_txpow(struct ath_softc *sc);
 int ath_cabq_update(struct ath_softc *);
-void ath_get_currentCountry(struct ath_softc *sc,
-	struct ath9k_country_entry *ctry);
 u64 ath_extend_tsf(struct ath_softc *sc, u32 rstamp);
 
 #endif /* CORE_H */