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

Commit 34faf780 authored by Zhu, Yi's avatar Zhu, Yi Committed by John W. Linville
Browse files

iwlwifi: some fh document fix and cleanup 



This patch cleans up some flow handler related document. It also
removes some blank lines.

Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Acked-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 352bc8de

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

+4 −5
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ static inline u8 iwl_get_dma_hi_addr(dma_addr_t addr) 
 * @lo: low [31:0] portion of the dma address of TX buffer

 * 	every even is unaligned on 16 bit boundary

 * @hi_n_len 0-3 [35:32] portion of dma

 *	     4-16 length of the tx buffer

 *	     4-15 length of the tx buffer

 */

struct iwl_tfd_tb {

	__le32 lo;
@@ -453,7 +453,8 @@ struct iwl_tfd_tb { 
 * Transmit Frame Descriptor (TFD)

 *

 * @ __reserved1[3] reserved

 * @ num_tbs 0-5 number of active tbs

 * @ num_tbs 0-4 number of active tbs

 *	     5   reserved

 * 	     6-7 padding (not used)

 * @ tbs[20]	transmit frame buffer descriptors

 * @ __pad 	padding
@@ -473,8 +474,6 @@ struct iwl_tfd_tb { 
 * Tx frame, up to 8 KBytes in size.

 *

 * A maximum of 255 (not 256!) TFDs may be on a queue waiting for Tx.

 *

 * Bit fields in the control dword (val0):

 */

struct iwl_tfd {

	u8 __reserved1[3];

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

+0 −4
Original line number Diff line number Diff line
@@ -587,8 +587,6 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv) 
	iwl_release_nic_access(priv);

	spin_unlock_irqrestore(&priv->lock, flags);







	/* Alloc and init all Tx queues, including the command queue (#4) */

	for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {

		slots_num = (txq_id == IWL_CMD_QUEUE_NUM) ?
@@ -618,11 +616,9 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv) 
 */

void iwl_txq_ctx_stop(struct iwl_priv *priv)

{



	int txq_id;

	unsigned long flags;





	/* Turn off all Tx DMA fifos */

	spin_lock_irqsave(&priv->lock, flags);

	if (iwl_grab_nic_access(priv)) {