diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/reset.c')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/reset.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c index 8bd62c130b26..4120068792ec 100644 --- a/drivers/net/wireless/ath/ath5k/reset.c +++ b/drivers/net/wireless/ath/ath5k/reset.c | |||
@@ -1033,11 +1033,6 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode, | |||
1033 | if (ret) | 1033 | if (ret) |
1034 | return ret; | 1034 | return ret; |
1035 | 1035 | ||
1036 | /* | ||
1037 | * Initialize operating mode | ||
1038 | */ | ||
1039 | ah->ah_op_mode = op_mode; | ||
1040 | |||
1041 | /* PHY access enable */ | 1036 | /* PHY access enable */ |
1042 | if (ah->ah_mac_srev >= AR5K_SREV_AR5211) | 1037 | if (ah->ah_mac_srev >= AR5K_SREV_AR5211) |
1043 | ath5k_hw_reg_write(ah, AR5K_PHY_SHIFT_5GHZ, AR5K_PHY(0)); | 1038 | ath5k_hw_reg_write(ah, AR5K_PHY_SHIFT_5GHZ, AR5K_PHY(0)); |
@@ -1208,7 +1203,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode, | |||
1208 | ath5k_hw_set_associd(ah); | 1203 | ath5k_hw_set_associd(ah); |
1209 | 1204 | ||
1210 | /* Set PCU config */ | 1205 | /* Set PCU config */ |
1211 | ath5k_hw_set_opmode(ah); | 1206 | ath5k_hw_set_opmode(ah, op_mode); |
1212 | 1207 | ||
1213 | /* Clear any pending interrupts | 1208 | /* Clear any pending interrupts |
1214 | * PISR/SISR Not available on 5210 */ | 1209 | * PISR/SISR Not available on 5210 */ |
@@ -1394,7 +1389,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode, | |||
1394 | * external 32KHz crystal when sleeping if one | 1389 | * external 32KHz crystal when sleeping if one |
1395 | * exists */ | 1390 | * exists */ |
1396 | if (ah->ah_version == AR5K_AR5212 && | 1391 | if (ah->ah_version == AR5K_AR5212 && |
1397 | ah->ah_op_mode != NL80211_IFTYPE_AP) | 1392 | op_mode != NL80211_IFTYPE_AP) |
1398 | ath5k_hw_set_sleep_clock(ah, true); | 1393 | ath5k_hw_set_sleep_clock(ah, true); |
1399 | 1394 | ||
1400 | /* | 1395 | /* |