From d89b2330ec6ed0fe8ac2b5fb3c6b394137e0c5c2 Mon Sep 17 00:00:00 2001
From: Bruno Randolf <br1@einfach.org>
Date: Wed, 19 Jan 2011 18:21:08 +0900
Subject: [PATCH] --- yaml --- r: 236767 b: refs/heads/master c:
 4b3721ceb3c1f9b032c6eeb108e44692efbcacef h: refs/heads/master i:   236765:
 8d9e0bdbd83ebe676cc68303563ceda4ed671ae7   236763:
 4efa8f9859cc14098cf63ac10b0167f2ea3af21e   236759:
 cb195fa48f706b0b9ed91bd534b8ced5c043e4d5   236751:
 5b2028778e63bf296299c82e04f9225861b4bbac   236735:
 e16fb19437e275e5c387c243257dfbdc1a6b9a1b v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/net/wireless/ath/ath5k/base.c | 18 ------------------
 trunk/drivers/net/wireless/ath/ath5k/base.h |  1 -
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index e52f77d026ed..107b3db6edf2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75f9569bfc4f3b138d196091b85c91678183520e
+refs/heads/master: 4b3721ceb3c1f9b032c6eeb108e44692efbcacef
diff --git a/trunk/drivers/net/wireless/ath/ath5k/base.c b/trunk/drivers/net/wireless/ath/ath5k/base.c
index 2de8e80bfdc9..43db07b9711b 100644
--- a/trunk/drivers/net/wireless/ath/ath5k/base.c
+++ b/trunk/drivers/net/wireless/ath/ath5k/base.c
@@ -445,18 +445,6 @@ ath5k_chan_set(struct ath5k_softc *sc, struct ieee80211_channel *chan)
 	return ath5k_reset(sc, chan, true);
 }
 
-static void
-ath5k_setcurmode(struct ath5k_softc *sc, unsigned int mode)
-{
-	sc->curmode = mode;
-
-	if (mode == AR5K_MODE_11A) {
-		sc->curband = &sc->sbands[IEEE80211_BAND_5GHZ];
-	} else {
-		sc->curband = &sc->sbands[IEEE80211_BAND_2GHZ];
-	}
-}
-
 struct ath_vif_iter_data {
 	const u8	*hw_macaddr;
 	u8		mask[ETH_ALEN];
@@ -2778,12 +2766,6 @@ ath5k_init(struct ieee80211_hw *hw)
 		goto err;
 	}
 
-	/* NB: setup here so ath5k_rate_update is happy */
-	if (test_bit(AR5K_MODE_11A, ah->ah_modes))
-		ath5k_setcurmode(sc, AR5K_MODE_11A);
-	else
-		ath5k_setcurmode(sc, AR5K_MODE_11B);
-
 	/*
 	 * Allocate tx+rx descriptors and populate the lists.
 	 */
diff --git a/trunk/drivers/net/wireless/ath/ath5k/base.h b/trunk/drivers/net/wireless/ath/ath5k/base.h
index 6d511476e4d2..58660e4d274a 100644
--- a/trunk/drivers/net/wireless/ath/ath5k/base.h
+++ b/trunk/drivers/net/wireless/ath/ath5k/base.h
@@ -202,7 +202,6 @@ struct ath5k_softc {
 #define ATH_STAT_STARTED	4		/* opened & irqs enabled */
 
 	unsigned int		filter_flags;	/* HW flags, AR5K_RX_FILTER_* */
-	unsigned int		curmode;	/* current phy mode */
 	struct ieee80211_channel *curchan;	/* current h/w channel */
 
 	u16			nvifs;