diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2009-03-26 13:14:08 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:54:27 -0400 |
commit | 6da3a13e4fcab0ff58592087d28bd283caf23d88 (patch) | |
tree | 1b67e34373d8b17ae66a66526cc72dfd6ad067b1 /drivers/net/wireless/iwlwifi/iwl-3945.h | |
parent | 4f5cab969bdbec1ab0c5b690282372b4978123ac (diff) |
iwlwifi: merge and better support of suspend/resume for iwlagn and iwl3945
With mac80211's help to call stop() and start() in mac80211
suspend/resume function, both iwlagn and iwl3945 no longer calling
stop() and start(); remove un-necessary STATUS_IN_SUSPEND bit from both
header files and functions,
Move apm_ops.stop() function into pci_suspend() to ensure
DMA is stopped before go into suspend mode.
iwl3945 has the similar suspend/resume function as iwlagn, so move both
functions to iwlcore to be shared by both drivers.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h index ab7aaf6872c7..29bc0d2656bc 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945.h | |||
@@ -162,7 +162,6 @@ struct iwl3945_frame { | |||
162 | #define STATUS_TEMPERATURE 8 | 162 | #define STATUS_TEMPERATURE 8 |
163 | #define STATUS_GEO_CONFIGURED 9 | 163 | #define STATUS_GEO_CONFIGURED 9 |
164 | #define STATUS_EXIT_PENDING 10 | 164 | #define STATUS_EXIT_PENDING 10 |
165 | #define STATUS_IN_SUSPEND 11 | ||
166 | #define STATUS_STATISTICS 12 | 165 | #define STATUS_STATISTICS 12 |
167 | #define STATUS_SCANNING 13 | 166 | #define STATUS_SCANNING 13 |
168 | #define STATUS_SCAN_ABORTING 14 | 167 | #define STATUS_SCAN_ABORTING 14 |