diff options
Diffstat (limited to 'drivers/net/wireless/ath5k/pcu.c')
-rw-r--r-- | drivers/net/wireless/ath5k/pcu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath5k/pcu.c b/drivers/net/wireless/ath5k/pcu.c index 5a896d1e2a2b..c77cee2a5582 100644 --- a/drivers/net/wireless/ath5k/pcu.c +++ b/drivers/net/wireless/ath5k/pcu.c | |||
@@ -52,26 +52,26 @@ int ath5k_hw_set_opmode(struct ath5k_hw *ah) | |||
52 | ATH5K_TRACE(ah->ah_sc); | 52 | ATH5K_TRACE(ah->ah_sc); |
53 | 53 | ||
54 | switch (ah->ah_op_mode) { | 54 | switch (ah->ah_op_mode) { |
55 | case IEEE80211_IF_TYPE_IBSS: | 55 | case NL80211_IFTYPE_ADHOC: |
56 | pcu_reg |= AR5K_STA_ID1_ADHOC | AR5K_STA_ID1_DESC_ANTENNA | | 56 | pcu_reg |= AR5K_STA_ID1_ADHOC | AR5K_STA_ID1_DESC_ANTENNA | |
57 | (ah->ah_version == AR5K_AR5210 ? | 57 | (ah->ah_version == AR5K_AR5210 ? |
58 | AR5K_STA_ID1_NO_PSPOLL : 0); | 58 | AR5K_STA_ID1_NO_PSPOLL : 0); |
59 | beacon_reg |= AR5K_BCR_ADHOC; | 59 | beacon_reg |= AR5K_BCR_ADHOC; |
60 | break; | 60 | break; |
61 | 61 | ||
62 | case IEEE80211_IF_TYPE_AP: | 62 | case NL80211_IFTYPE_AP: |
63 | case IEEE80211_IF_TYPE_MESH_POINT: | 63 | case NL80211_IFTYPE_MESH_POINT: |
64 | pcu_reg |= AR5K_STA_ID1_AP | AR5K_STA_ID1_RTS_DEF_ANTENNA | | 64 | pcu_reg |= AR5K_STA_ID1_AP | AR5K_STA_ID1_RTS_DEF_ANTENNA | |
65 | (ah->ah_version == AR5K_AR5210 ? | 65 | (ah->ah_version == AR5K_AR5210 ? |
66 | AR5K_STA_ID1_NO_PSPOLL : 0); | 66 | AR5K_STA_ID1_NO_PSPOLL : 0); |
67 | beacon_reg |= AR5K_BCR_AP; | 67 | beacon_reg |= AR5K_BCR_AP; |
68 | break; | 68 | break; |
69 | 69 | ||
70 | case IEEE80211_IF_TYPE_STA: | 70 | case NL80211_IFTYPE_STATION: |
71 | pcu_reg |= AR5K_STA_ID1_DEFAULT_ANTENNA | | 71 | pcu_reg |= AR5K_STA_ID1_DEFAULT_ANTENNA | |
72 | (ah->ah_version == AR5K_AR5210 ? | 72 | (ah->ah_version == AR5K_AR5210 ? |
73 | AR5K_STA_ID1_PWR_SV : 0); | 73 | AR5K_STA_ID1_PWR_SV : 0); |
74 | case IEEE80211_IF_TYPE_MNTR: | 74 | case NL80211_IFTYPE_MONITOR: |
75 | pcu_reg |= AR5K_STA_ID1_DEFAULT_ANTENNA | | 75 | pcu_reg |= AR5K_STA_ID1_DEFAULT_ANTENNA | |
76 | (ah->ah_version == AR5K_AR5210 ? | 76 | (ah->ah_version == AR5K_AR5210 ? |
77 | AR5K_STA_ID1_NO_PSPOLL : 0); | 77 | AR5K_STA_ID1_NO_PSPOLL : 0); |
@@ -649,7 +649,7 @@ void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval) | |||
649 | * Set the additional timers by mode | 649 | * Set the additional timers by mode |
650 | */ | 650 | */ |
651 | switch (ah->ah_op_mode) { | 651 | switch (ah->ah_op_mode) { |
652 | case IEEE80211_IF_TYPE_STA: | 652 | case NL80211_IFTYPE_STATION: |
653 | if (ah->ah_version == AR5K_AR5210) { | 653 | if (ah->ah_version == AR5K_AR5210) { |
654 | timer1 = 0xffffffff; | 654 | timer1 = 0xffffffff; |
655 | timer2 = 0xffffffff; | 655 | timer2 = 0xffffffff; |