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

Commit 16466903 authored by Ron Rindjunsky's avatar Ron Rindjunsky Committed by John W. Linville
Browse files

iwlwifi: remove 4965 prefix from iwl4965_kw and iwl4965_tx_queue 



This patch removes the 4965 prefix to form iwl_kw and iwl_tx_queue structs,
as they are used mostly in iwlcore now.

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d67f5489

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

+3 −3
Original line number Diff line number Diff line
@@ -880,7 +880,7 @@ static void iwl4965_set_wr_ptrs(struct iwl_priv *priv, int txq_id, u32 index) 
 * NOTE:  Acquire priv->lock before calling this function !

 */

static void iwl4965_tx_queue_set_status(struct iwl_priv *priv,

					struct iwl4965_tx_queue *txq,

					struct iwl_tx_queue *txq,

					int tx_fifo_id, int scd_retry)

{

	int txq_id = txq->q.id;
@@ -2111,7 +2111,7 @@ static void iwl4965_free_shared_mem(struct iwl_priv *priv) 
 * iwl4965_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array

 */

static void iwl4965_txq_update_byte_cnt_tbl(struct iwl_priv *priv,

					    struct iwl4965_tx_queue *txq,

					    struct iwl_tx_queue *txq,

					    u16 byte_cnt)

{

	int len;
@@ -3286,7 +3286,7 @@ static void iwl4965_rx_reply_compressed_ba(struct iwl_priv *priv, 
	struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data;

	struct iwl4965_compressed_ba_resp *ba_resp = &pkt->u.compressed_ba;

	int index;

	struct iwl4965_tx_queue *txq = NULL;

	struct iwl_tx_queue *txq = NULL;

	struct iwl_ht_agg *agg;

	DECLARE_MAC_BUF(mac);

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

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static int iwl5000_shared_mem_rx_idx(struct iwl_priv *priv) 
 * iwl5000_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array

 */

static void iwl5000_txq_update_byte_cnt_tbl(struct iwl_priv *priv,

					    struct iwl4965_tx_queue *txq,

					    struct iwl_tx_queue *txq,

					    u16 byte_cnt)

{

	struct iwl5000_shared *shared_data = priv->shared_virt;

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

+3 −3
Original line number Diff line number Diff line
@@ -143,9 +143,9 @@ int iwl_kw_init(struct iwl_priv *priv) 
int iwl_kw_alloc(struct iwl_priv *priv)

{

	struct pci_dev *dev = priv->pci_dev;

	struct iwl4965_kw *kw = &priv->kw;

	struct iwl_kw *kw = &priv->kw;



	kw->size = IWL4965_KW_SIZE;	/* TBW need set somewhere else */

	kw->size = IWL_KW_SIZE;

	kw->v_addr = pci_alloc_consistent(dev, kw->size, &kw->dma_addr);

	if (!kw->v_addr)

		return -ENOMEM;
@@ -159,7 +159,7 @@ int iwl_kw_alloc(struct iwl_priv *priv) 
void iwl_kw_free(struct iwl_priv *priv)

{

	struct pci_dev *dev = priv->pci_dev;

	struct iwl4965_kw *kw = &priv->kw;

	struct iwl_kw *kw = &priv->kw;



	if (kw->v_addr) {

		pci_free_consistent(dev, kw->size, kw->v_addr, kw->dma_addr);

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

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ struct iwl_lib_ops { 
	void (*free_shared_mem)(struct iwl_priv *priv);

	int (*shared_mem_rx_idx)(struct iwl_priv *priv);

	void (*txq_update_byte_cnt_tbl)(struct iwl_priv *priv,

					struct iwl4965_tx_queue *txq,

					struct iwl_tx_queue *txq,

					u16 byte_cnt);

	/* setup Rx handler */

	void (*rx_handler_setup)(struct iwl_priv *priv);
@@ -207,7 +207,7 @@ void iwl_rx_allocate(struct iwl_priv *priv); 
******************************************************/

int iwl_txq_ctx_reset(struct iwl_priv *priv);

/* FIXME: remove when free Tx is fully merged into iwlcore */

int iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl4965_tx_queue *txq);

int iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq);

void iwl_hw_txq_ctx_free(struct iwl_priv *priv);



/*****************************************************

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

+7 −7
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ struct iwl4965_tx_info { 
};



/**

 * struct iwl4965_tx_queue - Tx Queue for DMA

 * struct iwl_tx_queue - Tx Queue for DMA

 * @q: generic Rx/Tx queue descriptor

 * @bd: base of circular buffer of TFDs

 * @cmd: array of command/Tx buffers
@@ -136,7 +136,7 @@ struct iwl4965_tx_info { 
 * A Tx queue consists of circular buffer of BDs (a.k.a. TFDs, transmit frame

 * descriptors) and required locking structures.

 */

struct iwl4965_tx_queue {

struct iwl_tx_queue {

	struct iwl4965_queue q;

	struct iwl_tfd_frame *bd;

	struct iwl_cmd *cmd;
@@ -729,7 +729,7 @@ extern void iwl4965_radio_kill_sw(struct iwl_priv *priv, int disable_radio); 
 * Forward declare iwl-4965.c functions for iwl-base.c

 */

extern int iwl4965_tx_queue_update_wr_ptr(struct iwl_priv *priv,

					  struct iwl4965_tx_queue *txq,

					  struct iwl_tx_queue *txq,

					  u16 byte_cnt);

extern void iwl4965_add_station(struct iwl_priv *priv, const u8 *addr,

				int is_ap);
@@ -761,9 +761,9 @@ static inline void iwl4965_init_ht_hw_capab(const struct iwl_priv *priv, 
#endif /*CONFIG_IWL4965_HT */

/* Structures, enum, and defines specific to the 4965 */



#define IWL4965_KW_SIZE 0x1000	/*4k */

#define IWL_KW_SIZE 0x1000	/*4k */



struct iwl4965_kw {

struct iwl_kw {

	dma_addr_t dma_addr;

	void *v_addr;

	size_t size;
@@ -1061,9 +1061,9 @@ struct iwl_priv { 


	/* Rx and Tx DMA processing queues */

	struct iwl_rx_queue rxq;

	struct iwl4965_tx_queue txq[IWL_MAX_NUM_QUEUES];

	struct iwl_tx_queue txq[IWL_MAX_NUM_QUEUES];

	unsigned long txq_ctx_active_msk;

	struct iwl4965_kw kw;	/* keep warm address */

	struct iwl_kw kw;	/* keep warm address */

	u32 scd_base_addr;	/* scheduler sram base address */



	unsigned long status;