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

Commit d5b25c90 authored Jun 07, 2010 by Emmanuel Grumbach Committed by Reinette Chatre Jun 14, 2010

iwlwifi: rename rxq->dma_addr

Rename rxq->dma_addr to rxq->bd_dma to better emphasize that the
physical address stands for the receive buffer descriptor's address.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>

parent 815e629b

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -844,7 +844,7 @@ static int iwl3945_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src)

	static int iwl3945_rx_init(struct iwl_priv priv, struct iwl_rx_queue rxq)		static int iwl3945_rx_init(struct iwl_priv priv, struct iwl_rx_queue rxq)
	{		{
	iwl_write_direct32(priv, FH39_RCSR_RBD_BASE(0), rxq->dma_addr);		iwl_write_direct32(priv, FH39_RCSR_RBD_BASE(0), rxq->bd_dma);
	iwl_write_direct32(priv, FH39_RCSR_RPTR_ADDR(0), rxq->rb_stts_dma);		iwl_write_direct32(priv, FH39_RCSR_RPTR_ADDR(0), rxq->rb_stts_dma);
	iwl_write_direct32(priv, FH39_RCSR_WPTR(0), 0);		iwl_write_direct32(priv, FH39_RCSR_WPTR(0), 0);
	iwl_write_direct32(priv, FH39_RCSR_CONFIG(0),		iwl_write_direct32(priv, FH39_RCSR_CONFIG(0),

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -486,7 +486,7 @@ int iwlagn_rx_init(struct iwl_priv priv, struct iwl_rx_queue rxq)

	/* Tell device where to find RBD circular buffer in DRAM */		/* Tell device where to find RBD circular buffer in DRAM */
	iwl_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_BASE_REG,		iwl_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_BASE_REG,
	(u32)(rxq->dma_addr >> 8));		(u32)(rxq->bd_dma >> 8));

	/* Tell device where in DRAM to update its Rx status */		/* Tell device where in DRAM to update its Rx status */
	iwl_write_direct32(priv, FH_RSCSR_CHNL0_STTS_WPTR_REG,		iwl_write_direct32(priv, FH_RSCSR_CHNL0_STTS_WPTR_REG,
	@@ -751,7 +751,7 @@ void iwlagn_rx_queue_free(struct iwl_priv priv, struct iwl_rx_queue rxq)
	}		}

	dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,		dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
	rxq->dma_addr);		rxq->bd_dma);
	dma_free_coherent(&priv->pci_dev->dev, sizeof(struct iwl_rb_status),		dma_free_coherent(&priv->pci_dev->dev, sizeof(struct iwl_rb_status),
	rxq->rb_stts, rxq->rb_stts_dma);		rxq->rb_stts, rxq->rb_stts_dma);
	rxq->bd = NULL;		rxq->bd = NULL;

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -348,7 +348,7 @@ struct iwl_host_cmd {
	/**		/**
	* struct iwl_rx_queue - Rx queue		* struct iwl_rx_queue - Rx queue
	* @bd: driver's pointer to buffer of receive buffer descriptors (rbd)		* @bd: driver's pointer to buffer of receive buffer descriptors (rbd)
	* @dma_addr: bus address of buffer of receive buffer descriptors (rbd)		* @bd_dma: bus address of buffer of receive buffer descriptors (rbd)
	* @read: Shared index to newest available Rx buffer		* @read: Shared index to newest available Rx buffer
	* @write: Shared index to oldest written Rx packet		* @write: Shared index to oldest written Rx packet
	* @free_count: Number of pre-allocated buffers in rx_free		* @free_count: Number of pre-allocated buffers in rx_free
	@@ -362,7 +362,7 @@ struct iwl_host_cmd {
	*/		*/
	struct iwl_rx_queue {		struct iwl_rx_queue {
	__le32 *bd;		__le32 *bd;
	dma_addr_t dma_addr;		dma_addr_t bd_dma;
	struct iwl_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];		struct iwl_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];
	struct iwl_rx_mem_buffer *queue[RX_QUEUE_SIZE];		struct iwl_rx_mem_buffer *queue[RX_QUEUE_SIZE];
	u32 read;		u32 read;

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -175,7 +175,7 @@ int iwl_rx_queue_alloc(struct iwl_priv *priv)
	INIT_LIST_HEAD(&rxq->rx_used);		INIT_LIST_HEAD(&rxq->rx_used);

	/* Alloc the circular buffer of Read Buffer Descriptors (RBDs) */		/* Alloc the circular buffer of Read Buffer Descriptors (RBDs) */
	rxq->bd = dma_alloc_coherent(dev, 4 * RX_QUEUE_SIZE, &rxq->dma_addr,		rxq->bd = dma_alloc_coherent(dev, 4 * RX_QUEUE_SIZE, &rxq->bd_dma,
	GFP_KERNEL);		GFP_KERNEL);
	if (!rxq->bd)		if (!rxq->bd)
	goto err_bd;		goto err_bd;
	@@ -199,7 +199,7 @@ int iwl_rx_queue_alloc(struct iwl_priv *priv)

	err_rb:		err_rb:
	dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,		dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
	rxq->dma_addr);		rxq->bd_dma);
	err_bd:		err_bd:
	return -ENOMEM;		return -ENOMEM;
	}		}

drivers/net/wireless/iwlwifi/iwl3945-base.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1171,7 +1171,7 @@ static void iwl3945_rx_queue_free(struct iwl_priv priv, struct iwl_rx_queue rx
	}		}

	dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,		dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
	rxq->dma_addr);		rxq->bd_dma);
	dma_free_coherent(&priv->pci_dev->dev, sizeof(struct iwl_rb_status),		dma_free_coherent(&priv->pci_dev->dev, sizeof(struct iwl_rb_status),
	rxq->rb_stts, rxq->rb_stts_dma);		rxq->rb_stts, rxq->rb_stts_dma);
	rxq->bd = NULL;		rxq->bd = NULL;