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

Commit ccb6c1c0 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlagn: dont update bytecount table for command queue 



The device doesn't use the bytecount table for the
command queue, only for aggregation queues to make
aggregation decisions. So don't update it for the
command queue (and we even updated it with wrong
values).

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 4c2cde3b

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

+13 −15
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ void iwlagn_txq_update_byte_cnt_tbl(struct iwl_priv *priv, 


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



	if (txq_id != priv->cmd_queue) {

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

	sec_ctl = txq->cmd[txq->q.write_ptr]->cmd.tx.sec_ctl;
@@ -127,7 +126,6 @@ void iwlagn_txq_update_byte_cnt_tbl(struct iwl_priv *priv, 
		len += WEP_IV_LEN + WEP_ICV_LEN;

		break;

	}

	}



	bc_ent = cpu_to_le16((len & 0xFFF) | (sta_id << 12));

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

+0 −4
Original line number Diff line number Diff line
@@ -540,10 +540,6 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 
#endif

	txq->need_update = 1;



	if (priv->cfg->ops->lib->txq_update_byte_cnt_tbl)

		/* Set up entry in queue's byte count circular buffer */

		priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq, 0);



	phys_addr = pci_map_single(priv->pci_dev, &out_cmd->hdr,

				   fix_size, PCI_DMA_BIDIRECTIONAL);

	dma_unmap_addr_set(out_meta, mapping, phys_addr);