diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-03-21 16:53:44 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-03-25 16:41:55 -0400 |
commit | 857485c0c46ceee5c658c1761bba4d9a5ddf433f (patch) | |
tree | df2028c6a3d99ad32491efba7b6ca69f7d45edcf /drivers/net/wireless/iwlwifi/iwl-4965-commands.h | |
parent | 8622e7058a8764223ae2305d980a38d07f034717 (diff) |
iwlwifi: move host command sending functions to core module
1. Host command sending functions moved from iwl4965-base.c to iwl-hcmd.c
in iwlcore module
2. enqueue_hcmd function currently stays in iwl4965-base.c. It is invoked
through the new 'utils' field in priv's ops.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965-commands.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965-commands.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-commands.h b/drivers/net/wireless/iwlwifi/iwl-4965-commands.h index 1d82f105cc2..7e36ecb2757 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-4965-commands.h | |||
@@ -139,7 +139,7 @@ enum { | |||
139 | REPLY_PHY_CALIBRATION_CMD = 0xb0, | 139 | REPLY_PHY_CALIBRATION_CMD = 0xb0, |
140 | REPLY_RX_PHY_CMD = 0xc0, | 140 | REPLY_RX_PHY_CMD = 0xc0, |
141 | REPLY_RX_MPDU_CMD = 0xc1, | 141 | REPLY_RX_MPDU_CMD = 0xc1, |
142 | REPLY_4965_RX = 0xc3, | 142 | REPLY_RX = 0xc3, |
143 | REPLY_COMPRESSED_BA = 0xc5, | 143 | REPLY_COMPRESSED_BA = 0xc5, |
144 | REPLY_MAX = 0xff | 144 | REPLY_MAX = 0xff |
145 | }; | 145 | }; |
@@ -151,16 +151,16 @@ enum { | |||
151 | * | 151 | * |
152 | *****************************************************************************/ | 152 | *****************************************************************************/ |
153 | 153 | ||
154 | /* iwl4965_cmd_header flags value */ | 154 | /* iwl_cmd_header flags value */ |
155 | #define IWL_CMD_FAILED_MSK 0x40 | 155 | #define IWL_CMD_FAILED_MSK 0x40 |
156 | 156 | ||
157 | /** | 157 | /** |
158 | * struct iwl4965_cmd_header | 158 | * struct iwl_cmd_header |
159 | * | 159 | * |
160 | * This header format appears in the beginning of each command sent from the | 160 | * This header format appears in the beginning of each command sent from the |
161 | * driver, and each response/notification received from uCode. | 161 | * driver, and each response/notification received from uCode. |
162 | */ | 162 | */ |
163 | struct iwl4965_cmd_header { | 163 | struct iwl_cmd_header { |
164 | u8 cmd; /* Command ID: REPLY_RXON, etc. */ | 164 | u8 cmd; /* Command ID: REPLY_RXON, etc. */ |
165 | u8 flags; /* IWL_CMD_* */ | 165 | u8 flags; /* IWL_CMD_* */ |
166 | /* | 166 | /* |
@@ -194,7 +194,7 @@ struct iwl4965_cmd_header { | |||
194 | * 4965 rate_n_flags bit fields | 194 | * 4965 rate_n_flags bit fields |
195 | * | 195 | * |
196 | * rate_n_flags format is used in following 4965 commands: | 196 | * rate_n_flags format is used in following 4965 commands: |
197 | * REPLY_4965_RX (response only) | 197 | * REPLY_RX (response only) |
198 | * REPLY_TX (both command and response) | 198 | * REPLY_TX (both command and response) |
199 | * REPLY_TX_LINK_QUALITY_CMD | 199 | * REPLY_TX_LINK_QUALITY_CMD |
200 | * | 200 | * |
@@ -939,7 +939,7 @@ struct iwl4965_rx_non_cfg_phy { | |||
939 | } __attribute__ ((packed)); | 939 | } __attribute__ ((packed)); |
940 | 940 | ||
941 | /* | 941 | /* |
942 | * REPLY_4965_RX = 0xc3 (response only, not a command) | 942 | * REPLY_RX = 0xc3 (response only, not a command) |
943 | * Used only for legacy (non 11n) frames. | 943 | * Used only for legacy (non 11n) frames. |
944 | */ | 944 | */ |
945 | #define RX_RES_PHY_CNT 14 | 945 | #define RX_RES_PHY_CNT 14 |
@@ -2664,7 +2664,7 @@ struct iwl4965_led_cmd { | |||
2664 | 2664 | ||
2665 | struct iwl4965_rx_packet { | 2665 | struct iwl4965_rx_packet { |
2666 | __le32 len; | 2666 | __le32 len; |
2667 | struct iwl4965_cmd_header hdr; | 2667 | struct iwl_cmd_header hdr; |
2668 | union { | 2668 | union { |
2669 | struct iwl4965_alive_resp alive_frame; | 2669 | struct iwl4965_alive_resp alive_frame; |
2670 | struct iwl4965_rx_frame rx_frame; | 2670 | struct iwl4965_rx_frame rx_frame; |