iwlwifi: remove host commands structures from iwl_cmd (3257e5d4) · Commits · 戴 / test

drivers/net/wireless/iwlwifi/iwl-dev.h

+1 −8

Original line number	Diff line number	Diff line
		@@ -268,23 +268,16 @@ struct iwl_cmd {
		struct iwl_cmd_meta meta; /* driver data */
		struct iwl_cmd_header hdr; /* uCode API */
		union {
		struct iwl_addsta_cmd addsta;
		struct iwl_led_cmd led;
		u32 flags;
		u8 val8;
		u16 val16;
		u32 val32;
		struct iwl4965_bt_cmd bt;
		struct iwl_powertable_cmd powertable;
		struct iwl_qosparam_cmd qosparam;
		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];
		} __attribute__ ((packed)) cmd;
		} __attribute__ ((packed));


		struct iwl_host_cmd {
		u8 id;
		u16 len;

+6 −2

Original line number	Diff line number	Diff line
		@@ -102,7 +102,9 @@ static int iwl_add_sta_callback(struct iwl_priv *priv,
		struct iwl_cmd cmd, struct sk_buff skb)
		{
		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) {
		IWL_ERROR("Error: Response NULL in REPLY_ADD_STA.\n");
		@@ -320,7 +322,9 @@ static int iwl_remove_sta_callback(struct iwl_priv *priv,
		struct iwl_cmd cmd, struct sk_buff skb)
		{
		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) {
		IWL_ERROR("Error: Response NULL in REPLY_REMOVE_STA.\n");