Commit 3257e5d4 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville

iwlwifi: remove host commands structures from iwl_cmd

This patch removes host commands structures from iwl_cmd
to make more HW oblivious
tx cmd was left it needs special treatment.
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Reviewed-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 56e12615
...@@ -268,23 +268,16 @@ struct iwl_cmd { ...@@ -268,23 +268,16 @@ struct iwl_cmd {
struct iwl_cmd_meta meta; /* driver data */ struct iwl_cmd_meta meta; /* driver data */
struct iwl_cmd_header hdr; /* uCode API */ struct iwl_cmd_header hdr; /* uCode API */
union { union {
struct iwl_addsta_cmd addsta;
struct iwl_led_cmd led;
u32 flags; u32 flags;
u8 val8; u8 val8;
u16 val16; u16 val16;
u32 val32; u32 val32;
struct iwl4965_bt_cmd bt;
struct iwl_powertable_cmd powertable;
struct iwl_qosparam_cmd qosparam;
struct iwl_tx_cmd tx; struct iwl_tx_cmd tx;
struct iwl4965_rxon_assoc_cmd rxon_assoc;
struct iwl_rem_sta_cmd rm_sta;
u8 *indirect;
u8 payload[IWL_CMD_MAX_PAYLOAD]; u8 payload[IWL_CMD_MAX_PAYLOAD];
} __attribute__ ((packed)) cmd; } __attribute__ ((packed)) cmd;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct iwl_host_cmd { struct iwl_host_cmd {
u8 id; u8 id;
u16 len; u16 len;
......
...@@ -102,7 +102,9 @@ static int iwl_add_sta_callback(struct iwl_priv *priv, ...@@ -102,7 +102,9 @@ static int iwl_add_sta_callback(struct iwl_priv *priv,
struct iwl_cmd *cmd, struct sk_buff *skb) struct iwl_cmd *cmd, struct sk_buff *skb)
{ {
struct iwl_rx_packet *res = NULL; struct iwl_rx_packet *res = NULL;
u8 sta_id = cmd->cmd.addsta.sta.sta_id; struct iwl_addsta_cmd *addsta =
(struct iwl_addsta_cmd *)cmd->cmd.payload;
u8 sta_id = addsta->sta.sta_id;
if (!skb) { if (!skb) {
IWL_ERROR("Error: Response NULL in REPLY_ADD_STA.\n"); IWL_ERROR("Error: Response NULL in REPLY_ADD_STA.\n");
...@@ -320,7 +322,9 @@ static int iwl_remove_sta_callback(struct iwl_priv *priv, ...@@ -320,7 +322,9 @@ static int iwl_remove_sta_callback(struct iwl_priv *priv,
struct iwl_cmd *cmd, struct sk_buff *skb) struct iwl_cmd *cmd, struct sk_buff *skb)
{ {
struct iwl_rx_packet *res = NULL; struct iwl_rx_packet *res = NULL;
const char *addr = cmd->cmd.rm_sta.addr; struct iwl_rem_sta_cmd *rm_sta =
(struct iwl_rem_sta_cmd *)cmd->cmd.payload;
const char *addr = rm_sta->addr;
if (!skb) { if (!skb) {
IWL_ERROR("Error: Response NULL in REPLY_REMOVE_STA.\n"); IWL_ERROR("Error: Response NULL in REPLY_REMOVE_STA.\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment