diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.h | 18 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-shared.h | 24 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | 8 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 6 |
6 files changed, 31 insertions, 29 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h index caef7a996d3..4485a0c8385 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn.h | |||
@@ -82,6 +82,24 @@ extern struct iwl_lib_ops iwl6030_lib; | |||
82 | 82 | ||
83 | 83 | ||
84 | 84 | ||
85 | /***************************************************** | ||
86 | * DRIVER STATUS FUNCTIONS | ||
87 | ******************************************************/ | ||
88 | #define STATUS_RF_KILL_HW 0 | ||
89 | #define STATUS_CT_KILL 1 | ||
90 | #define STATUS_ALIVE 2 | ||
91 | #define STATUS_READY 3 | ||
92 | #define STATUS_GEO_CONFIGURED 4 | ||
93 | #define STATUS_EXIT_PENDING 5 | ||
94 | #define STATUS_STATISTICS 6 | ||
95 | #define STATUS_SCANNING 7 | ||
96 | #define STATUS_SCAN_ABORTING 8 | ||
97 | #define STATUS_SCAN_HW 9 | ||
98 | #define STATUS_FW_ERROR 10 | ||
99 | #define STATUS_CHANNEL_SWITCH_PENDING 11 | ||
100 | #define STATUS_SCAN_COMPLETE 12 | ||
101 | #define STATUS_POWER_PMI 13 | ||
102 | |||
85 | struct iwl_ucode_capabilities; | 103 | struct iwl_ucode_capabilities; |
86 | 104 | ||
87 | extern struct ieee80211_ops iwlagn_hw_ops; | 105 | extern struct ieee80211_ops iwlagn_hw_ops; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h index 2fe3145575f..82b52dac38e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/drivers/net/wireless/iwlwifi/iwl-shared.h | |||
@@ -185,28 +185,4 @@ const char *get_cmd_string(u8 cmd); | |||
185 | 185 | ||
186 | #define IWL_CMD(x) case x: return #x | 186 | #define IWL_CMD(x) case x: return #x |
187 | 187 | ||
188 | /***************************************************** | ||
189 | * DRIVER STATUS FUNCTIONS | ||
190 | ******************************************************/ | ||
191 | #define STATUS_HCMD_ACTIVE 0 /* host command in progress */ | ||
192 | /* 1 is unused (used to be STATUS_HCMD_SYNC_ACTIVE) */ | ||
193 | #define STATUS_INT_ENABLED 2 | ||
194 | #define STATUS_RF_KILL_HW 3 | ||
195 | #define STATUS_CT_KILL 4 | ||
196 | #define STATUS_INIT 5 | ||
197 | #define STATUS_ALIVE 6 | ||
198 | #define STATUS_READY 7 | ||
199 | #define STATUS_TEMPERATURE 8 | ||
200 | #define STATUS_GEO_CONFIGURED 9 | ||
201 | #define STATUS_EXIT_PENDING 10 | ||
202 | #define STATUS_STATISTICS 12 | ||
203 | #define STATUS_SCANNING 13 | ||
204 | #define STATUS_SCAN_ABORTING 14 | ||
205 | #define STATUS_SCAN_HW 15 | ||
206 | #define STATUS_POWER_PMI 16 | ||
207 | #define STATUS_FW_ERROR 17 | ||
208 | #define STATUS_DEVICE_ENABLED 18 | ||
209 | #define STATUS_CHANNEL_SWITCH_PENDING 19 | ||
210 | #define STATUS_SCAN_COMPLETE 20 | ||
211 | |||
212 | #endif /* #__iwl_shared_h__ */ | 188 | #endif /* #__iwl_shared_h__ */ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h index 731d2750439..6704dab4232 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | |||
@@ -278,6 +278,14 @@ struct iwl_trans_pcie { | |||
278 | unsigned long wd_timeout; | 278 | unsigned long wd_timeout; |
279 | }; | 279 | }; |
280 | 280 | ||
281 | /***************************************************** | ||
282 | * DRIVER STATUS FUNCTIONS | ||
283 | ******************************************************/ | ||
284 | #define STATUS_HCMD_ACTIVE 0 | ||
285 | #define STATUS_DEVICE_ENABLED 1 | ||
286 | #define STATUS_TPOWER_PMI 2 | ||
287 | #define STATUS_INT_ENABLED 3 | ||
288 | |||
281 | #define IWL_TRANS_GET_PCIE_TRANS(_iwl_trans) \ | 289 | #define IWL_TRANS_GET_PCIE_TRANS(_iwl_trans) \ |
282 | ((struct iwl_trans_pcie *) ((_iwl_trans)->trans_specific)) | 290 | ((struct iwl_trans_pcie *) ((_iwl_trans)->trans_specific)) |
283 | 291 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c index 96ca5ade927..bf83806130e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | |||
@@ -150,7 +150,7 @@ void iwl_rx_queue_update_write_ptr(struct iwl_trans *trans, | |||
150 | IWL_TRANS_GET_PCIE_TRANS(trans); | 150 | IWL_TRANS_GET_PCIE_TRANS(trans); |
151 | 151 | ||
152 | /* If power-saving is in use, make sure device is awake */ | 152 | /* If power-saving is in use, make sure device is awake */ |
153 | if (test_bit(STATUS_POWER_PMI, &trans_pcie->status)) { | 153 | if (test_bit(STATUS_TPOWER_PMI, &trans_pcie->status)) { |
154 | reg = iwl_read32(trans, CSR_UCODE_DRV_GP1); | 154 | reg = iwl_read32(trans, CSR_UCODE_DRV_GP1); |
155 | 155 | ||
156 | if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) { | 156 | if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c index 2bc267074f6..21b7ca272af 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | |||
@@ -107,7 +107,7 @@ void iwl_txq_update_write_ptr(struct iwl_trans *trans, struct iwl_tx_queue *txq) | |||
107 | struct iwl_trans_pcie *trans_pcie = | 107 | struct iwl_trans_pcie *trans_pcie = |
108 | IWL_TRANS_GET_PCIE_TRANS(trans); | 108 | IWL_TRANS_GET_PCIE_TRANS(trans); |
109 | /* if we're trying to save power */ | 109 | /* if we're trying to save power */ |
110 | if (test_bit(STATUS_POWER_PMI, &trans_pcie->status)) { | 110 | if (test_bit(STATUS_TPOWER_PMI, &trans_pcie->status)) { |
111 | /* wake up nic if it's powered down ... | 111 | /* wake up nic if it's powered down ... |
112 | * uCode will wake up, and interrupt us again, so next | 112 | * uCode will wake up, and interrupt us again, so next |
113 | * time we'll skip this part. */ | 113 | * time we'll skip this part. */ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c index 1b7c846b375..333a2784cf0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | |||
@@ -1253,7 +1253,7 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans) | |||
1253 | clear_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status); | 1253 | clear_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status); |
1254 | clear_bit(STATUS_INT_ENABLED, &trans_pcie->status); | 1254 | clear_bit(STATUS_INT_ENABLED, &trans_pcie->status); |
1255 | clear_bit(STATUS_DEVICE_ENABLED, &trans_pcie->status); | 1255 | clear_bit(STATUS_DEVICE_ENABLED, &trans_pcie->status); |
1256 | clear_bit(STATUS_POWER_PMI, &trans_pcie->status); | 1256 | clear_bit(STATUS_TPOWER_PMI, &trans_pcie->status); |
1257 | } | 1257 | } |
1258 | 1258 | ||
1259 | static void iwl_trans_pcie_wowlan_suspend(struct iwl_trans *trans) | 1259 | static void iwl_trans_pcie_wowlan_suspend(struct iwl_trans *trans) |
@@ -1574,9 +1574,9 @@ static void iwl_trans_pcie_set_pmi(struct iwl_trans *trans, bool state) | |||
1574 | struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); | 1574 | struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); |
1575 | 1575 | ||
1576 | if (state) | 1576 | if (state) |
1577 | set_bit(STATUS_POWER_PMI, &trans_pcie->status); | 1577 | set_bit(STATUS_TPOWER_PMI, &trans_pcie->status); |
1578 | else | 1578 | else |
1579 | clear_bit(STATUS_POWER_PMI, &trans_pcie->status); | 1579 | clear_bit(STATUS_TPOWER_PMI, &trans_pcie->status); |
1580 | } | 1580 | } |
1581 | 1581 | ||
1582 | #ifdef CONFIG_PM_SLEEP | 1582 | #ifdef CONFIG_PM_SLEEP |