Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 132f98c2 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: simplify the iwl_device_cmd layout 



This simplifies both the transport layer and the upper layer.

Kill the union in the device command, which avoids the funny syntax
we had: cmd->cmd.payload.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 247c61d6

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
		goto drop_unlock_sta;



	memset(dev_cmd, 0, sizeof(*dev_cmd));

	tx_cmd = &dev_cmd->cmd.tx;

	tx_cmd = (struct iwl_tx_cmd *) dev_cmd->payload;



	/* Copy MAC header from skb into command buffer */

	memcpy(tx_cmd->hdr, hdr, hdr_len);

drivers/net/wireless/iwlwifi/iwl-sta.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ int iwl_add_sta_callback(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb, 
{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_addsta_cmd *addsta =

		(struct iwl_addsta_cmd *)cmd->cmd.payload;

		(struct iwl_addsta_cmd *) cmd->payload;



	return iwl_process_add_sta_resp(priv, addsta, pkt);

}

drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c

+8 −4
Original line number Diff line number Diff line
@@ -59,13 +59,15 @@ void iwl_trans_txq_update_byte_cnt_tbl(struct iwl_trans *trans, 
	u8 sta_id = 0;

	u16 len = byte_cnt + IWL_TX_CRC_SIZE + IWL_TX_DELIMITER_SIZE;

	__le16 bc_ent;

	struct iwl_tx_cmd *tx_cmd =

		(struct iwl_tx_cmd *) txq->cmd[txq->q.write_ptr]->payload;



	scd_bc_tbl = trans_pcie->scd_bc_tbls.addr;



	WARN_ON(len > 0xFFF || write_ptr >= TFD_QUEUE_SIZE_MAX);



	sta_id = txq->cmd[txq->q.write_ptr]->cmd.tx.sta_id;

	sec_ctl = txq->cmd[txq->q.write_ptr]->cmd.tx.sec_ctl;

	sta_id = tx_cmd->sta_id;

	sec_ctl = tx_cmd->sec_ctl;



	switch (sec_ctl & TX_CMD_SEC_MSK) {

	case TX_CMD_SEC_CCM:
@@ -353,11 +355,13 @@ static void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_trans *trans, 
	int read_ptr = txq->q.read_ptr;

	u8 sta_id = 0;

	__le16 bc_ent;

	struct iwl_tx_cmd *tx_cmd =

		(struct iwl_tx_cmd *) txq->cmd[txq->q.read_ptr]->payload;



	WARN_ON(read_ptr >= TFD_QUEUE_SIZE_MAX);



	if (txq_id != trans->shrd->cmd_queue)

		sta_id = txq->cmd[read_ptr]->cmd.tx.sta_id;

		sta_id = tx_cmd->sta_id;



	bc_ent = cpu_to_le16(1 | (sta_id << 12));

	scd_bc_tbl[txq_id].tfd_offset[read_ptr] = bc_ent;
@@ -773,7 +777,7 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd) 


	/* and copy the data that needs to be copied */



	cmd_dest = &out_cmd->cmd.payload[0];

	cmd_dest = out_cmd->payload;

	for (i = 0; i < IWL_MAX_CMD_TFDS; i++) {

		if (!cmd->len[i])

			continue;

drivers/net/wireless/iwlwifi/iwl-trans-pcie.c

+1 −1
Original line number Diff line number Diff line
@@ -1043,7 +1043,7 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, 
	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct iwl_tx_cmd *tx_cmd = &dev_cmd->cmd.tx;

	struct iwl_tx_cmd *tx_cmd = (struct iwl_tx_cmd *) dev_cmd->payload;

	struct iwl_cmd_meta *out_meta;

	struct iwl_tx_queue *txq;

	struct iwl_queue *q;

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

+1 −9
Original line number Diff line number Diff line
@@ -97,15 +97,7 @@ enum { 
 */

struct iwl_device_cmd {

	struct iwl_cmd_header hdr;	/* uCode API */

	union {

		u32 flags;

		u8 val8;

		u16 val16;

		u32 val32;

		struct iwl_tx_cmd tx;

		struct iwl6000_channel_switch_cmd chswitch;

	u8 payload[DEF_CMD_PAYLOAD_SIZE];

	} __packed cmd;

} __packed;



#define TFD_MAX_PAYLOAD_SIZE (sizeof(struct iwl_device_cmd))