diff options
author | Bruno Randolf <br1@einfach.org> | 2010-03-09 02:55:38 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-03-10 17:44:33 -0500 |
commit | ccfe5552aeb18c87a4d0ecb8cb7512280435bfdd (patch) | |
tree | 4856db3614b872aa01914daa161c5c6432c566a3 /drivers/net/wireless/ath/ath5k/attach.c | |
parent | caec9112d6cb07cb5b82a967a448c3b15b257654 (diff) |
ath5k: remove double opmode definition
opmode (operating mode) was defined in struct ath5k_hw and struct ath5k_softc.
remove it from ath5k_hw and use only from ath5k_softc (sc->opmode).
(btw: what's the meaning of opmode when we have multiple interfaces?)
Signed-off-by: Bruno Randolf <br1@einfach.org>
Acked-by: Nick Kossifidis <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/attach.c')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/attach.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c index c8bb102a4db4..66758cb66d50 100644 --- a/drivers/net/wireless/ath/ath5k/attach.c +++ b/drivers/net/wireless/ath/ath5k/attach.c | |||
@@ -113,7 +113,6 @@ int ath5k_hw_attach(struct ath5k_softc *sc) | |||
113 | /* | 113 | /* |
114 | * HW information | 114 | * HW information |
115 | */ | 115 | */ |
116 | ah->ah_op_mode = NL80211_IFTYPE_STATION; | ||
117 | ah->ah_radar.r_enabled = AR5K_TUNE_RADAR_ALERT; | 116 | ah->ah_radar.r_enabled = AR5K_TUNE_RADAR_ALERT; |
118 | ah->ah_turbo = false; | 117 | ah->ah_turbo = false; |
119 | ah->ah_txpower.txp_tpc = AR5K_TUNE_TPC_TXPOWER; | 118 | ah->ah_txpower.txp_tpc = AR5K_TUNE_TPC_TXPOWER; |
@@ -328,7 +327,7 @@ int ath5k_hw_attach(struct ath5k_softc *sc) | |||
328 | /* Set BSSID to bcast address: ff:ff:ff:ff:ff:ff for now */ | 327 | /* Set BSSID to bcast address: ff:ff:ff:ff:ff:ff for now */ |
329 | memcpy(common->curbssid, ath_bcast_mac, ETH_ALEN); | 328 | memcpy(common->curbssid, ath_bcast_mac, ETH_ALEN); |
330 | ath5k_hw_set_associd(ah); | 329 | ath5k_hw_set_associd(ah); |
331 | ath5k_hw_set_opmode(ah); | 330 | ath5k_hw_set_opmode(ah, sc->opmode); |
332 | 331 | ||
333 | ath5k_hw_rfgain_opt_init(ah); | 332 | ath5k_hw_rfgain_opt_init(ah); |
334 | 333 | ||