iwlegacy: rename iwl to il

iwl_legacy prefix result in long function names, what cause that we
have frequent line split and not readable code. Also iwl_foo symbols
are duplicated in iwlwifi driver, what is annoying when editing
kernel tree with cscope.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>

1 files changed, 190 insertions, 190 deletions

diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
index 2be6d9e3b01..25f1d4768e7 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
@@ -40,11 +40,11 @@
 #include "iwl-4965.h"
 #include "iwl-sta.h"
 
-void iwl4965_check_abort_status(struct iwl_priv *priv,
+void il4965_check_abort_status(struct il_priv *priv,
 			    u8 frame_count, u32 status)
 {
 	if (frame_count == 1 && status == TX_STATUS_FAIL_RFKILL_FLUSH) {
-		IWL_ERR(priv, "Tx flush command to flush out all frames\n");
+		IL_ERR(priv, "Tx flush command to flush out all frames\n");
 		if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
 			queue_work(priv->workqueue, &priv->tx_flush);
 	}
@@ -53,13 +53,13 @@ void iwl4965_check_abort_status(struct iwl_priv *priv,
 /*
  * EEPROM
  */
-struct iwl_mod_params iwl4965_mod_params = {
+struct il_mod_params il4965_mod_params = {
 	.amsdu_size_8K = 1,
 	.restart_fw = 1,
 	/* the rest are 0 by default */
 };
 
-void iwl4965_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
+void il4965_rx_queue_reset(struct il_priv *priv, struct il_rx_queue *rxq)
 {
 	unsigned long flags;
 	int i;
@@ -74,7 +74,7 @@ void iwl4965_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
 			pci_unmap_page(priv->pci_dev, rxq->pool[i].page_dma,
 				PAGE_SIZE << priv->hw_params.rx_page_order,
 				PCI_DMA_FROMDEVICE);
-			__iwl_legacy_free_pages(priv, rxq->pool[i].page);
+			__il_free_pages(priv, rxq->pool[i].page);
 			rxq->pool[i].page = NULL;
 		}
 		list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
@@ -91,7 +91,7 @@ void iwl4965_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
 	spin_unlock_irqrestore(&rxq->lock, flags);
 }
 
-int iwl4965_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
+int il4965_rx_init(struct il_priv *priv, struct il_rx_queue *rxq)
 {
 	u32 rb_size;
 	const u32 rfdnlog = RX_QUEUE_SIZE_LOG; /* 256 RBDs */
@@ -103,17 +103,17 @@ int iwl4965_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
 		rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K;
 
 	/* Stop Rx DMA */
-	iwl_legacy_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);
+	il_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);
 
 	/* Reset driver's Rx queue write index */
-	iwl_legacy_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_WPTR_REG, 0);
+	il_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_WPTR_REG, 0);
 
 	/* Tell device where to find RBD circular buffer in DRAM */
-	iwl_legacy_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_BASE_REG,
+	il_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_BASE_REG,
 			   (u32)(rxq->bd_dma >> 8));
 
 	/* Tell device where in DRAM to update its Rx status */
-	iwl_legacy_write_direct32(priv, FH_RSCSR_CHNL0_STTS_WPTR_REG,
+	il_write_direct32(priv, FH_RSCSR_CHNL0_STTS_WPTR_REG,
 			   rxq->rb_stts_dma >> 4);
 
 	/* Enable Rx DMA
@@ -122,7 +122,7 @@ int iwl4965_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
 	 * RB timeout 0x10
 	 * 256 RBDs
 	 */
-	iwl_legacy_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG,
+	il_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG,
 			   FH_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL |
 			   FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL |
 			   FH_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME_MSK |
@@ -131,32 +131,32 @@ int iwl4965_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
 			   (rfdnlog << FH_RCSR_RX_CONFIG_RBDCB_SIZE_POS));
 
 	/* Set interrupt coalescing timer to default (2048 usecs) */
-	iwl_write8(priv, CSR_INT_COALESCING, IWL_HOST_INT_TIMEOUT_DEF);
+	il_write8(priv, CSR_INT_COALESCING, IL_HOST_INT_TIMEOUT_DEF);
 
 	return 0;
 }
 
-static void iwl4965_set_pwr_vmain(struct iwl_priv *priv)
+static void il4965_set_pwr_vmain(struct il_priv *priv)
 {
 /*
  * (for documentation purposes)
  * to set power to V_AUX, do:
 
 		if (pci_pme_capable(priv->pci_dev, PCI_D3cold))
-			iwl_legacy_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
+			il_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
 					       APMG_PS_CTRL_VAL_PWR_SRC_VAUX,
 					       ~APMG_PS_CTRL_MSK_PWR_SRC);
  */
 
-	iwl_legacy_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
+	il_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
 			       APMG_PS_CTRL_VAL_PWR_SRC_VMAIN,
 			       ~APMG_PS_CTRL_MSK_PWR_SRC);
 }
 
-int iwl4965_hw_nic_init(struct iwl_priv *priv)
+int il4965_hw_nic_init(struct il_priv *priv)
 {
 	unsigned long flags;
-	struct iwl_rx_queue *rxq = &priv->rxq;
+	struct il_rx_queue *rxq = &priv->rxq;
 	int ret;
 
 	/* nic_init */
@@ -164,42 +164,42 @@ int iwl4965_hw_nic_init(struct iwl_priv *priv)
 	priv->cfg->ops->lib->apm_ops.init(priv);
 
 	/* Set interrupt coalescing calibration timer to default (512 usecs) */
-	iwl_write8(priv, CSR_INT_COALESCING, IWL_HOST_INT_CALIB_TIMEOUT_DEF);
+	il_write8(priv, CSR_INT_COALESCING, IL_HOST_INT_CALIB_TIMEOUT_DEF);
 
 	spin_unlock_irqrestore(&priv->lock, flags);
 
-	iwl4965_set_pwr_vmain(priv);
+	il4965_set_pwr_vmain(priv);
 
 	priv->cfg->ops->lib->apm_ops.config(priv);
 
 	/* Allocate the RX queue, or reset if it is already allocated */
 	if (!rxq->bd) {
-		ret = iwl_legacy_rx_queue_alloc(priv);
+		ret = il_rx_queue_alloc(priv);
 		if (ret) {
-			IWL_ERR(priv, "Unable to initialize Rx queue\n");
+			IL_ERR(priv, "Unable to initialize Rx queue\n");
 			return -ENOMEM;
 		}
 	} else
-		iwl4965_rx_queue_reset(priv, rxq);
+		il4965_rx_queue_reset(priv, rxq);
 
-	iwl4965_rx_replenish(priv);
+	il4965_rx_replenish(priv);
 
-	iwl4965_rx_init(priv, rxq);
+	il4965_rx_init(priv, rxq);
 
 	spin_lock_irqsave(&priv->lock, flags);
 
 	rxq->need_update = 1;
-	iwl_legacy_rx_queue_update_write_ptr(priv, rxq);
+	il_rx_queue_update_write_ptr(priv, rxq);
 
 	spin_unlock_irqrestore(&priv->lock, flags);
 
 	/* Allocate or reset and init all Tx and Command queues */
 	if (!priv->txq) {
-		ret = iwl4965_txq_ctx_alloc(priv);
+		ret = il4965_txq_ctx_alloc(priv);
 		if (ret)
 			return ret;
 	} else
-		iwl4965_txq_ctx_reset(priv);
+		il4965_txq_ctx_reset(priv);
 
 	set_bit(STATUS_INIT, &priv->status);
 
@@ -207,16 +207,16 @@ int iwl4965_hw_nic_init(struct iwl_priv *priv)
 }
 
 /**
- * iwl4965_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr
+ * il4965_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr
  */
-static inline __le32 iwl4965_dma_addr2rbd_ptr(struct iwl_priv *priv,
+static inline __le32 il4965_dma_addr2rbd_ptr(struct il_priv *priv,
 					  dma_addr_t dma_addr)
 {
 	return cpu_to_le32((u32)(dma_addr >> 8));
 }
 
 /**
- * iwl4965_rx_queue_restock - refill RX queue from pre-allocated pool
+ * il4965_rx_queue_restock - refill RX queue from pre-allocated pool
  *
  * If there are slots in the RX queue that need to be restocked,
  * and we have free pre-allocated buffers, fill the ranks as much
@@ -226,26 +226,26 @@ static inline __le32 iwl4965_dma_addr2rbd_ptr(struct iwl_priv *priv,
  * also updates the memory address in the firmware to reference the new
  * target buffer.
  */
-void iwl4965_rx_queue_restock(struct iwl_priv *priv)
+void il4965_rx_queue_restock(struct il_priv *priv)
 {
-	struct iwl_rx_queue *rxq = &priv->rxq;
+	struct il_rx_queue *rxq = &priv->rxq;
 	struct list_head *element;
-	struct iwl_rx_mem_buffer *rxb;
+	struct il_rx_mem_buffer *rxb;
 	unsigned long flags;
 
 	spin_lock_irqsave(&rxq->lock, flags);
-	while ((iwl_legacy_rx_queue_space(rxq) > 0) && (rxq->free_count)) {
+	while ((il_rx_queue_space(rxq) > 0) && (rxq->free_count)) {
 		/* The overwritten rxb must be a used one */
 		rxb = rxq->queue[rxq->write];
 		BUG_ON(rxb && rxb->page);
 
 		/* Get next free Rx buffer, remove from free list */
 		element = rxq->rx_free.next;
-		rxb = list_entry(element, struct iwl_rx_mem_buffer, list);
+		rxb = list_entry(element, struct il_rx_mem_buffer, list);
 		list_del(element);
 
 		/* Point to Rx buffer via next RBD in circular buffer */
-		rxq->bd[rxq->write] = iwl4965_dma_addr2rbd_ptr(priv,
+		rxq->bd[rxq->write] = il4965_dma_addr2rbd_ptr(priv,
 							      rxb->page_dma);
 		rxq->queue[rxq->write] = rxb;
 		rxq->write = (rxq->write + 1) & RX_QUEUE_MASK;
@@ -264,23 +264,23 @@ void iwl4965_rx_queue_restock(struct iwl_priv *priv)
 		spin_lock_irqsave(&rxq->lock, flags);
 		rxq->need_update = 1;
 		spin_unlock_irqrestore(&rxq->lock, flags);
-		iwl_legacy_rx_queue_update_write_ptr(priv, rxq);
+		il_rx_queue_update_write_ptr(priv, rxq);
 	}
 }
 
 /**
- * iwl4965_rx_replenish - Move all used packet from rx_used to rx_free
+ * il4965_rx_replenish - Move all used packet from rx_used to rx_free
  *
  * When moving to rx_free an SKB is allocated for the slot.
  *
- * Also restock the Rx queue via iwl_rx_queue_restock.
+ * Also restock the Rx queue via il_rx_queue_restock.
  * This is called as a scheduled work item (except for during initialization)
  */
-static void iwl4965_rx_allocate(struct iwl_priv *priv, gfp_t priority)
+static void il4965_rx_allocate(struct il_priv *priv, gfp_t priority)
 {
-	struct iwl_rx_queue *rxq = &priv->rxq;
+	struct il_rx_queue *rxq = &priv->rxq;
 	struct list_head *element;
-	struct iwl_rx_mem_buffer *rxb;
+	struct il_rx_mem_buffer *rxb;
 	struct page *page;
 	unsigned long flags;
 	gfp_t gfp_mask = priority;
@@ -303,13 +303,13 @@ static void iwl4965_rx_allocate(struct iwl_priv *priv, gfp_t priority)
 		page = alloc_pages(gfp_mask, priv->hw_params.rx_page_order);
 		if (!page) {
 			if (net_ratelimit())
-				IWL_DEBUG_INFO(priv, "alloc_pages failed, "
+				IL_DEBUG_INFO(priv, "alloc_pages failed, "
 					       "order: %d\n",
 					       priv->hw_params.rx_page_order);
 
 			if ((rxq->free_count <= RX_LOW_WATERMARK) &&
 			    net_ratelimit())
-				IWL_CRIT(priv,
+				IL_CRIT(priv,
 					"Failed to alloc_pages with %s. "
 					"Only %u free buffers remaining.\n",
 					 priority == GFP_ATOMIC ?
@@ -329,7 +329,7 @@ static void iwl4965_rx_allocate(struct iwl_priv *priv, gfp_t priority)
 			return;
 		}
 		element = rxq->rx_used.next;
-		rxb = list_entry(element, struct iwl_rx_mem_buffer, list);
+		rxb = list_entry(element, struct il_rx_mem_buffer, list);
 		list_del(element);
 
 		spin_unlock_irqrestore(&rxq->lock, flags);
@@ -355,22 +355,22 @@ static void iwl4965_rx_allocate(struct iwl_priv *priv, gfp_t priority)
 	}
 }
 
-void iwl4965_rx_replenish(struct iwl_priv *priv)
+void il4965_rx_replenish(struct il_priv *priv)
 {
 	unsigned long flags;
 
-	iwl4965_rx_allocate(priv, GFP_KERNEL);
+	il4965_rx_allocate(priv, GFP_KERNEL);
 
 	spin_lock_irqsave(&priv->lock, flags);
-	iwl4965_rx_queue_restock(priv);
+	il4965_rx_queue_restock(priv);
 	spin_unlock_irqrestore(&priv->lock, flags);
 }
 
-void iwl4965_rx_replenish_now(struct iwl_priv *priv)
+void il4965_rx_replenish_now(struct il_priv *priv)
 {
-	iwl4965_rx_allocate(priv, GFP_ATOMIC);
+	il4965_rx_allocate(priv, GFP_ATOMIC);
 
-	iwl4965_rx_queue_restock(priv);
+	il4965_rx_queue_restock(priv);
 }
 
 /* Assumes that the skb field of the buffers in 'pool' is kept accurate.
@@ -378,7 +378,7 @@ void iwl4965_rx_replenish_now(struct iwl_priv *priv)
  * This free routine walks the list of POOL entries and if SKB is set to
  * non NULL it is unmapped and freed
  */
-void iwl4965_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
+void il4965_rx_queue_free(struct il_priv *priv, struct il_rx_queue *rxq)
 {
 	int i;
 	for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {
@@ -386,31 +386,31 @@ void iwl4965_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
 			pci_unmap_page(priv->pci_dev, rxq->pool[i].page_dma,
 				PAGE_SIZE << priv->hw_params.rx_page_order,
 				PCI_DMA_FROMDEVICE);
-			__iwl_legacy_free_pages(priv, rxq->pool[i].page);
+			__il_free_pages(priv, rxq->pool[i].page);
 			rxq->pool[i].page = NULL;
 		}
 	}
 
 	dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
 			  rxq->bd_dma);
-	dma_free_coherent(&priv->pci_dev->dev, sizeof(struct iwl_rb_status),
+	dma_free_coherent(&priv->pci_dev->dev, sizeof(struct il_rb_status),
 			  rxq->rb_stts, rxq->rb_stts_dma);
 	rxq->bd = NULL;
 	rxq->rb_stts  = NULL;
 }
 
-int iwl4965_rxq_stop(struct iwl_priv *priv)
+int il4965_rxq_stop(struct il_priv *priv)
 {
 
 	/* stop Rx DMA */
-	iwl_legacy_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);
-	iwl_poll_direct_bit(priv, FH_MEM_RSSR_RX_STATUS_REG,
+	il_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);
+	il_poll_direct_bit(priv, FH_MEM_RSSR_RX_STATUS_REG,
 			    FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);
 
 	return 0;
 }
 
-int iwl4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band)
+int il4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band)
 {
 	int idx = 0;
 	int band_offset = 0;
@@ -422,8 +422,8 @@ int iwl4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band)
 	/* Legacy rate format, search for match in table */
 	} else {
 		if (band == IEEE80211_BAND_5GHZ)
-			band_offset = IWL_FIRST_OFDM_RATE;
-		for (idx = band_offset; idx < IWL_RATE_COUNT_LEGACY; idx++)
+			band_offset = IL_FIRST_OFDM_RATE;
+		for (idx = band_offset; idx < IL_RATE_COUNT_LEGACY; idx++)
 			if (iwlegacy_rates[idx].plcp == (rate_n_flags & 0xFF))
 				return idx - band_offset;
 	}
@@ -431,13 +431,13 @@ int iwl4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band)
 	return -1;
 }
 
-static int iwl4965_calc_rssi(struct iwl_priv *priv,
-			     struct iwl_rx_phy_res *rx_resp)
+static int il4965_calc_rssi(struct il_priv *priv,
+			     struct il_rx_phy_res *rx_resp)
 {
 	/* data from PHY/DSP regarding signal strength, etc.,
 	 *   contents are always there, not configurable by host.  */
-	struct iwl4965_rx_non_cfg_phy *ncphy =
-	    (struct iwl4965_rx_non_cfg_phy *)rx_resp->non_cfg_phy_buf;
+	struct il4965_rx_non_cfg_phy *ncphy =
+	    (struct il4965_rx_non_cfg_phy *)rx_resp->non_cfg_phy_buf;
 	u32 agc = (le16_to_cpu(ncphy->agc_info) & IWL49_AGC_DB_MASK)
 			>> IWL49_AGC_DB_POS;
 
@@ -456,7 +456,7 @@ static int iwl4965_calc_rssi(struct iwl_priv *priv,
 		if (valid_antennae & (1 << i))
 			max_rssi = max(ncphy->rssi_info[i << 1], max_rssi);
 
-	IWL_DEBUG_STATS(priv, "Rssi In A %d B %d C %d Max %d AGC dB %d\n",
+	IL_DEBUG_STATS(priv, "Rssi In A %d B %d C %d Max %d AGC dB %d\n",
 		ncphy->rssi_info[0], ncphy->rssi_info[2], ncphy->rssi_info[4],
 		max_rssi, agc);
 
@@ -466,7 +466,7 @@ static int iwl4965_calc_rssi(struct iwl_priv *priv,
 }
 
 
-static u32 iwl4965_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in)
+static u32 il4965_translate_rx_status(struct il_priv *priv, u32 decrypt_in)
 {
 	u32 decrypt_out = 0;
 
@@ -519,17 +519,17 @@ static u32 iwl4965_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in)
 		break;
 	}
 
-	IWL_DEBUG_RX(priv, "decrypt_in:0x%x  decrypt_out = 0x%x\n",
+	IL_DEBUG_RX(priv, "decrypt_in:0x%x  decrypt_out = 0x%x\n",
 					decrypt_in, decrypt_out);
 
 	return decrypt_out;
 }
 
-static void iwl4965_pass_packet_to_mac80211(struct iwl_priv *priv,
+static void il4965_pass_packet_to_mac80211(struct il_priv *priv,
 					struct ieee80211_hdr *hdr,
 					u16 len,
 					u32 ampdu_status,
-					struct iwl_rx_mem_buffer *rxb,
+					struct il_rx_mem_buffer *rxb,
 					struct ieee80211_rx_status *stats)
 {
 	struct sk_buff *skb;
@@ -537,25 +537,25 @@ static void iwl4965_pass_packet_to_mac80211(struct iwl_priv *priv,
 
 	/* We only process data packets if the interface is open */
 	if (unlikely(!priv->is_open)) {
-		IWL_DEBUG_DROP_LIMIT(priv,
+		IL_DEBUG_DROP_LIMIT(priv,
 		    "Dropping packet while interface is not open.\n");
 		return;
 	}
 
 	/* In case of HW accelerated crypto and bad decryption, drop */
 	if (!priv->cfg->mod_params->sw_crypto &&
-	    iwl_legacy_set_decrypted_flag(priv, hdr, ampdu_status, stats))
+	    il_set_decrypted_flag(priv, hdr, ampdu_status, stats))
 		return;
 
 	skb = dev_alloc_skb(128);
 	if (!skb) {
-		IWL_ERR(priv, "dev_alloc_skb failed\n");
+		IL_ERR(priv, "dev_alloc_skb failed\n");
 		return;
 	}
 
 	skb_add_rx_frag(skb, 0, rxb->page, (void *)hdr - rxb_addr(rxb), len);
 
-	iwl_legacy_update_stats(priv, false, fc, len);
+	il_update_stats(priv, false, fc, len);
 	memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats));
 
 	ieee80211_rx(priv->hw, skb);
@@ -565,15 +565,15 @@ static void iwl4965_pass_packet_to_mac80211(struct iwl_priv *priv,
 
 /* Called for REPLY_RX (legacy ABG frames), or
  * REPLY_RX_MPDU_CMD (HT high-throughput N frames). */
-void iwl4965_rx_reply_rx(struct iwl_priv *priv,
-				struct iwl_rx_mem_buffer *rxb)
+void il4965_rx_reply_rx(struct il_priv *priv,
+				struct il_rx_mem_buffer *rxb)
 {
 	struct ieee80211_hdr *header;
 	struct ieee80211_rx_status rx_status;
-	struct iwl_rx_packet *pkt = rxb_addr(rxb);
-	struct iwl_rx_phy_res *phy_res;
+	struct il_rx_packet *pkt = rxb_addr(rxb);
+	struct il_rx_phy_res *phy_res;
 	__le32 rx_pkt_status;
-	struct iwl_rx_mpdu_res_start *amsdu;
+	struct il_rx_mpdu_res_start *amsdu;
 	u32 len;
 	u32 ampdu_status;
 	u32 rate_n_flags;
@@ -588,7 +588,7 @@ void iwl4965_rx_reply_rx(struct iwl_priv *priv,
 	 * received.
 	 */
 	if (pkt->hdr.cmd == REPLY_RX) {
-		phy_res = (struct iwl_rx_phy_res *)pkt->u.raw;
+		phy_res = (struct il_rx_phy_res *)pkt->u.raw;
 		header = (struct ieee80211_hdr *)(pkt->u.raw + sizeof(*phy_res)
 				+ phy_res->cfg_phy_cnt);
 
@@ -598,27 +598,27 @@ void iwl4965_rx_reply_rx(struct iwl_priv *priv,
 		ampdu_status = le32_to_cpu(rx_pkt_status);
 	} else {
 		if (!priv->_4965.last_phy_res_valid) {
-			IWL_ERR(priv, "MPDU frame without cached PHY data\n");
+			IL_ERR(priv, "MPDU frame without cached PHY data\n");
 			return;
 		}
 		phy_res = &priv->_4965.last_phy_res;
-		amsdu = (struct iwl_rx_mpdu_res_start *)pkt->u.raw;
+		amsdu = (struct il_rx_mpdu_res_start *)pkt->u.raw;
 		header = (struct ieee80211_hdr *)(pkt->u.raw + sizeof(*amsdu));
 		len = le16_to_cpu(amsdu->byte_count);
 		rx_pkt_status = *(__le32 *)(pkt->u.raw + sizeof(*amsdu) + len);
-		ampdu_status = iwl4965_translate_rx_status(priv,
+		ampdu_status = il4965_translate_rx_status(priv,
 				le32_to_cpu(rx_pkt_status));
 	}
 
 	if ((unlikely(phy_res->cfg_phy_cnt > 20))) {
-		IWL_DEBUG_DROP(priv, "dsp size out of range [0,20]: %d/n",
+		IL_DEBUG_DROP(priv, "dsp size out of range [0,20]: %d/n",
 				phy_res->cfg_phy_cnt);
 		return;
 	}
 
 	if (!(rx_pkt_status & RX_RES_STATUS_NO_CRC32_ERROR) ||
 	    !(rx_pkt_status & RX_RES_STATUS_NO_RXE_OVERFLOW)) {
-		IWL_DEBUG_RX(priv, "Bad CRC or FIFO: 0x%08X.\n",
+		IL_DEBUG_RX(priv, "Bad CRC or FIFO: 0x%08X.\n",
 				le32_to_cpu(rx_pkt_status));
 		return;
 	}
@@ -634,7 +634,7 @@ void iwl4965_rx_reply_rx(struct iwl_priv *priv,
 		ieee80211_channel_to_frequency(le16_to_cpu(phy_res->channel),
 							rx_status.band);
 	rx_status.rate_idx =
-		iwl4965_hwrate_to_mac80211_idx(rate_n_flags, rx_status.band);
+		il4965_hwrate_to_mac80211_idx(rate_n_flags, rx_status.band);
 	rx_status.flag = 0;
 
 	/* TSF isn't reliable. In order to allow smooth user experience,
@@ -644,10 +644,10 @@ void iwl4965_rx_reply_rx(struct iwl_priv *priv,
 	priv->ucode_beacon_time = le32_to_cpu(phy_res->beacon_time_stamp);
 
 	/* Find max signal strength (dBm) among 3 antenna/receiver chains */
-	rx_status.signal = iwl4965_calc_rssi(priv, phy_res);
+	rx_status.signal = il4965_calc_rssi(priv, phy_res);
 
-	iwl_legacy_dbg_log_rx_data_frame(priv, len, header);
-	IWL_DEBUG_STATS_LIMIT(priv, "Rssi %d, TSF %llu\n",
+	il_dbg_log_rx_data_frame(priv, len, header);
+	IL_DEBUG_STATS_LIMIT(priv, "Rssi %d, TSF %llu\n",
 		rx_status.signal, (unsigned long long)rx_status.mactime);
 
 	/*
@@ -679,41 +679,41 @@ void iwl4965_rx_reply_rx(struct iwl_priv *priv,
 	if (rate_n_flags & RATE_MCS_SGI_MSK)
 		rx_status.flag |= RX_FLAG_SHORT_GI;
 
-	iwl4965_pass_packet_to_mac80211(priv, header, len, ampdu_status,
+	il4965_pass_packet_to_mac80211(priv, header, len, ampdu_status,
 				    rxb, &rx_status);
 }
 
 /* Cache phy data (Rx signal strength, etc) for HT frame (REPLY_RX_PHY_CMD).
- * This will be used later in iwl_rx_reply_rx() for REPLY_RX_MPDU_CMD. */
-void iwl4965_rx_reply_rx_phy(struct iwl_priv *priv,
-			    struct iwl_rx_mem_buffer *rxb)
+ * This will be used later in il_rx_reply_rx() for REPLY_RX_MPDU_CMD. */
+void il4965_rx_reply_rx_phy(struct il_priv *priv,
+			    struct il_rx_mem_buffer *rxb)
 {
-	struct iwl_rx_packet *pkt = rxb_addr(rxb);
+	struct il_rx_packet *pkt = rxb_addr(rxb);
 	priv->_4965.last_phy_res_valid = true;
 	memcpy(&priv->_4965.last_phy_res, pkt->u.raw,
-	       sizeof(struct iwl_rx_phy_res));
+	       sizeof(struct il_rx_phy_res));
 }
 
-static int iwl4965_get_channels_for_scan(struct iwl_priv *priv,
+static int il4965_get_channels_for_scan(struct il_priv *priv,
 				     struct ieee80211_vif *vif,
 				     enum ieee80211_band band,
 				     u8 is_active, u8 n_probes,
-				     struct iwl_scan_channel *scan_ch)
+				     struct il_scan_channel *scan_ch)
 {
 	struct ieee80211_channel *chan;
 	const struct ieee80211_supported_band *sband;
-	const struct iwl_channel_info *ch_info;
+	const struct il_channel_info *ch_info;
 	u16 passive_dwell = 0;
 	u16 active_dwell = 0;
 	int added, i;
 	u16 channel;
 
-	sband = iwl_get_hw_mode(priv, band);
+	sband = il_get_hw_mode(priv, band);
 	if (!sband)
 		return 0;
 
-	active_dwell = iwl_legacy_get_active_dwell_time(priv, band, n_probes);
-	passive_dwell = iwl_legacy_get_passive_dwell_time(priv, band, vif);
+	active_dwell = il_get_active_dwell_time(priv, band, n_probes);
+	passive_dwell = il_get_passive_dwell_time(priv, band, vif);
 
 	if (passive_dwell <= active_dwell)
 		passive_dwell = active_dwell + 1;
@@ -727,22 +727,22 @@ static int iwl4965_get_channels_for_scan(struct iwl_priv *priv,
 		channel = chan->hw_value;
 		scan_ch->channel = cpu_to_le16(channel);
 
-		ch_info = iwl_legacy_get_channel_info(priv, band, channel);
-		if (!iwl_legacy_is_channel_valid(ch_info)) {
-			IWL_DEBUG_SCAN(priv,
+		ch_info = il_get_channel_info(priv, band, channel);
+		if (!il_is_channel_valid(ch_info)) {
+			IL_DEBUG_SCAN(priv,
 				 "Channel %d is INVALID for this band.\n",
 					channel);
 			continue;
 		}
 
-		if (!is_active || iwl_legacy_is_channel_passive(ch_info) ||
+		if (!is_active || il_is_channel_passive(ch_info) ||
 		    (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
 			scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
 		else
 			scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
 
 		if (n_probes)
-			scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes);
+			scan_ch->type |= IL_SCAN_PROBE_MASK(n_probes);
 
 		scan_ch->active_dwell = cpu_to_le16(active_dwell);
 		scan_ch->passive_dwell = cpu_to_le16(passive_dwell);
@@ -759,7 +759,7 @@ static int iwl4965_get_channels_for_scan(struct iwl_priv *priv,
 		else
 			scan_ch->tx_gain = ((1 << 5) | (5 << 3));
 
-		IWL_DEBUG_SCAN(priv, "Scanning ch=%d prob=0x%X [%s %d]\n",
+		IL_DEBUG_SCAN(priv, "Scanning ch=%d prob=0x%X [%s %d]\n",
 			       channel, le32_to_cpu(scan_ch->type),
 			       (scan_ch->type & SCAN_CHANNEL_TYPE_ACTIVE) ?
 				"ACTIVE" : "PASSIVE",
@@ -770,19 +770,19 @@ static int iwl4965_get_channels_for_scan(struct iwl_priv *priv,
 		added++;
 	}
 
-	IWL_DEBUG_SCAN(priv, "total channels to scan %d\n", added);
+	IL_DEBUG_SCAN(priv, "total channels to scan %d\n", added);
 	return added;
 }
 
-int iwl4965_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
+int il4965_request_scan(struct il_priv *priv, struct ieee80211_vif *vif)
 {
-	struct iwl_host_cmd cmd = {
+	struct il_host_cmd cmd = {
 		.id = REPLY_SCAN_CMD,
-		.len = sizeof(struct iwl_scan_cmd),
+		.len = sizeof(struct il_scan_cmd),
 		.flags = CMD_SIZE_HUGE,
 	};
-	struct iwl_scan_cmd *scan;
-	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
+	struct il_scan_cmd *scan;
+	struct il_rxon_context *ctx = &priv->contexts[IL_RXON_CTX_BSS];
 	u32 rate_flags = 0;
 	u16 cmd_len;
 	u16 rx_chain = 0;
@@ -799,30 +799,30 @@ int iwl4965_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 	lockdep_assert_held(&priv->mutex);
 
 	if (vif)
-		ctx = iwl_legacy_rxon_ctx_from_vif(vif);
+		ctx = il_rxon_ctx_from_vif(vif);
 
 	if (!priv->scan_cmd) {
-		priv->scan_cmd = kmalloc(sizeof(struct iwl_scan_cmd) +
-					 IWL_MAX_SCAN_SIZE, GFP_KERNEL);
+		priv->scan_cmd = kmalloc(sizeof(struct il_scan_cmd) +
+					 IL_MAX_SCAN_SIZE, GFP_KERNEL);
 		if (!priv->scan_cmd) {
-			IWL_DEBUG_SCAN(priv,
+			IL_DEBUG_SCAN(priv,
 				       "fail to allocate memory for scan\n");
 			return -ENOMEM;
 		}
 	}
 	scan = priv->scan_cmd;
-	memset(scan, 0, sizeof(struct iwl_scan_cmd) + IWL_MAX_SCAN_SIZE);
+	memset(scan, 0, sizeof(struct il_scan_cmd) + IL_MAX_SCAN_SIZE);
 
-	scan->quiet_plcp_th = IWL_PLCP_QUIET_THRESH;
-	scan->quiet_time = IWL_ACTIVE_QUIET_TIME;
+	scan->quiet_plcp_th = IL_PLCP_QUIET_THRESH;
+	scan->quiet_time = IL_ACTIVE_QUIET_TIME;
 
-	if (iwl_legacy_is_any_associated(priv)) {
+	if (il_is_any_associated(priv)) {
 		u16 interval;
 		u32 extra;
 		u32 suspend_time = 100;
 		u32 scan_suspend_time = 100;
 
-		IWL_DEBUG_INFO(priv, "Scanning while associated...\n");
+		IL_DEBUG_INFO(priv, "Scanning while associated...\n");
 		interval = vif->bss_conf.beacon_int;
 
 		scan->suspend_time = 0;
@@ -834,13 +834,13 @@ int iwl4965_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 		scan_suspend_time = (extra |
 		    ((suspend_time % interval) * 1024));
 		scan->suspend_time = cpu_to_le32(scan_suspend_time);
-		IWL_DEBUG_SCAN(priv, "suspend_time 0x%X beacon interval %d\n",
+		IL_DEBUG_SCAN(priv, "suspend_time 0x%X beacon interval %d\n",
 			       scan_suspend_time, interval);
 	}
 
 	if (priv->scan_request->n_ssids) {
 		int i, p = 0;
-		IWL_DEBUG_SCAN(priv, "Kicking off active scan\n");
+		IL_DEBUG_SCAN(priv, "Kicking off active scan\n");
 		for (i = 0; i < priv->scan_request->n_ssids; i++) {
 			/* always does wildcard anyway */
 			if (!priv->scan_request->ssids[i].ssid_len)
@@ -856,7 +856,7 @@ int iwl4965_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 		}
 		is_active = true;
 	} else
-		IWL_DEBUG_SCAN(priv, "Start passive scan.\n");
+		IL_DEBUG_SCAN(priv, "Start passive scan.\n");
 
 	scan->tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK;
 	scan->tx_cmd.sta_id = ctx->bcast_sta_id;
@@ -866,21 +866,21 @@ int iwl4965_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 	case IEEE80211_BAND_2GHZ:
 		scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;
 		chan_mod = le32_to_cpu(
-			priv->contexts[IWL_RXON_CTX_BSS].active.flags &
+			priv->contexts[IL_RXON_CTX_BSS].active.flags &
 						RXON_FLG_CHANNEL_MODE_MSK)
 				       >> RXON_FLG_CHANNEL_MODE_POS;
 		if (chan_mod == CHANNEL_MODE_PURE_40) {
-			rate = IWL_RATE_6M_PLCP;
+			rate = IL_RATE_6M_PLCP;
 		} else {
-			rate = IWL_RATE_1M_PLCP;
+			rate = IL_RATE_1M_PLCP;
 			rate_flags = RATE_MCS_CCK_MSK;
 		}
 		break;
 	case IEEE80211_BAND_5GHZ:
-		rate = IWL_RATE_6M_PLCP;
+		rate = IL_RATE_6M_PLCP;
 		break;
 	default:
-		IWL_WARN(priv, "Invalid scan band\n");
+		IL_WARN(priv, "Invalid scan band\n");
 		return -EIO;
 	}
 
@@ -898,22 +898,22 @@ int iwl4965_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 	 * need to receive during our dwell time on a channel before
 	 * sending out probes -- setting this to a huge value will
 	 * mean we never reach it, but at the same time work around
-	 * the aforementioned issue. Thus use IWL_GOOD_CRC_TH_NEVER
-	 * here instead of IWL_GOOD_CRC_TH_DISABLED.
+	 * the aforementioned issue. Thus use IL_GOOD_CRC_TH_NEVER
+	 * here instead of IL_GOOD_CRC_TH_DISABLED.
 	 */
-	scan->good_CRC_th = is_active ? IWL_GOOD_CRC_TH_DEFAULT :
-					IWL_GOOD_CRC_TH_NEVER;
+	scan->good_CRC_th = is_active ? IL_GOOD_CRC_TH_DEFAULT :
+					IL_GOOD_CRC_TH_NEVER;
 
 	band = priv->scan_band;
 
 	if (priv->cfg->scan_rx_antennas[band])
 		rx_ant = priv->cfg->scan_rx_antennas[band];
 
-	priv->scan_tx_ant[band] = iwl4965_toggle_tx_ant(priv,
+	priv->scan_tx_ant[band] = il4965_toggle_tx_ant(priv,
 						priv->scan_tx_ant[band],
 						    scan_tx_antennas);
-	rate_flags |= iwl4965_ant_idx_to_flags(priv->scan_tx_ant[band]);
-	scan->tx_cmd.rate_n_flags = iwl4965_hw_set_rate_n_flags(rate, rate_flags);
+	rate_flags |= il4965_ant_idx_to_flags(priv->scan_tx_ant[band]);
+	scan->tx_cmd.rate_n_flags = il4965_hw_set_rate_n_flags(rate, rate_flags);
 
 	/* In power save mode use one chain, otherwise use all chains */
 	if (test_bit(STATUS_POWER_PMI, &priv->status)) {
@@ -923,10 +923,10 @@ int iwl4965_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 		if (!active_chains)
 			active_chains = rx_ant;
 
-		IWL_DEBUG_SCAN(priv, "chain_noise_data.active_chains: %u\n",
+		IL_DEBUG_SCAN(priv, "chain_noise_data.active_chains: %u\n",
 				priv->chain_noise_data.active_chains);
 
-		rx_ant = iwl4965_first_antenna(active_chains);
+		rx_ant = il4965_first_antenna(active_chains);
 	}
 
 	/* MIMO is not used here, but value is required */
@@ -936,53 +936,53 @@ int iwl4965_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 	rx_chain |= 0x1 << RXON_RX_CHAIN_DRIVER_FORCE_POS;
 	scan->rx_chain = cpu_to_le16(rx_chain);
 
-	cmd_len = iwl_legacy_fill_probe_req(priv,
+	cmd_len = il_fill_probe_req(priv,
 					(struct ieee80211_mgmt *)scan->data,
 					vif->addr,
 					priv->scan_request->ie,
 					priv->scan_request->ie_len,
-					IWL_MAX_SCAN_SIZE - sizeof(*scan));
+					IL_MAX_SCAN_SIZE - sizeof(*scan));
 	scan->tx_cmd.len = cpu_to_le16(cmd_len);
 
 	scan->filter_flags |= (RXON_FILTER_ACCEPT_GRP_MSK |
 			       RXON_FILTER_BCON_AWARE_MSK);
 
-	scan->channel_count = iwl4965_get_channels_for_scan(priv, vif, band,
+	scan->channel_count = il4965_get_channels_for_scan(priv, vif, band,
 						is_active, n_probes,
 						(void *)&scan->data[cmd_len]);
 	if (scan->channel_count == 0) {
-		IWL_DEBUG_SCAN(priv, "channel count %d\n", scan->channel_count);
+		IL_DEBUG_SCAN(priv, "channel count %d\n", scan->channel_count);
 		return -EIO;
 	}
 
 	cmd.len += le16_to_cpu(scan->tx_cmd.len) +
-	    scan->channel_count * sizeof(struct iwl_scan_channel);
+	    scan->channel_count * sizeof(struct il_scan_channel);
 	cmd.data = scan;
 	scan->len = cpu_to_le16(cmd.len);
 
 	set_bit(STATUS_SCAN_HW, &priv->status);
 
-	ret = iwl_legacy_send_cmd_sync(priv, &cmd);
+	ret = il_send_cmd_sync(priv, &cmd);
 	if (ret)
 		clear_bit(STATUS_SCAN_HW, &priv->status);
 
 	return ret;
 }
 
-int iwl4965_manage_ibss_station(struct iwl_priv *priv,
+int il4965_manage_ibss_station(struct il_priv *priv,
 			       struct ieee80211_vif *vif, bool add)
 {
-	struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
+	struct il_vif_priv *vif_priv = (void *)vif->drv_priv;
 
 	if (add)
-		return iwl4965_add_bssid_station(priv, vif_priv->ctx,
+		return il4965_add_bssid_station(priv, vif_priv->ctx,
 						vif->bss_conf.bssid,
 						&vif_priv->ibss_bssid_sta_id);
-	return iwl_legacy_remove_station(priv, vif_priv->ibss_bssid_sta_id,
+	return il_remove_station(priv, vif_priv->ibss_bssid_sta_id,
 				  vif->bss_conf.bssid);
 }
 
-void iwl4965_free_tfds_in_queue(struct iwl_priv *priv,
+void il4965_free_tfds_in_queue(struct il_priv *priv,
 			    int sta_id, int tid, int freed)
 {
 	lockdep_assert_held(&priv->sta_lock);
@@ -990,25 +990,25 @@ void iwl4965_free_tfds_in_queue(struct iwl_priv *priv,
 	if (priv->stations[sta_id].tid[tid].tfds_in_queue >= freed)
 		priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;
 	else {
-		IWL_DEBUG_TX(priv, "free more than tfds_in_queue (%u:%d)\n",
+		IL_DEBUG_TX(priv, "free more than tfds_in_queue (%u:%d)\n",
 			priv->stations[sta_id].tid[tid].tfds_in_queue,
 			freed);
 		priv->stations[sta_id].tid[tid].tfds_in_queue = 0;
 	}
 }
 
-#define IWL_TX_QUEUE_MSK	0xfffff
+#define IL_TX_QUEUE_MSK	0xfffff
 
-static bool iwl4965_is_single_rx_stream(struct iwl_priv *priv)
+static bool il4965_is_single_rx_stream(struct il_priv *priv)
 {
 	return priv->current_ht_config.smps == IEEE80211_SMPS_STATIC ||
 	       priv->current_ht_config.single_chain_sufficient;
 }
 
-#define IWL_NUM_RX_CHAINS_MULTIPLE	3
-#define IWL_NUM_RX_CHAINS_SINGLE	2
-#define IWL_NUM_IDLE_CHAINS_DUAL	2
-#define IWL_NUM_IDLE_CHAINS_SINGLE	1
+#define IL_NUM_RX_CHAINS_MULTIPLE	3
+#define IL_NUM_RX_CHAINS_SINGLE	2
+#define IL_NUM_IDLE_CHAINS_DUAL	2
+#define IL_NUM_IDLE_CHAINS_SINGLE	1
 
 /*
  * Determine how many receiver/antenna chains to use.
@@ -1020,13 +1020,13 @@ static bool iwl4965_is_single_rx_stream(struct iwl_priv *priv)
  * MIMO (dual stream) requires at least 2, but works better with 3.
  * This does not determine *which* chains to use, just how many.
  */
-static int iwl4965_get_active_rx_chain_count(struct iwl_priv *priv)
+static int il4965_get_active_rx_chain_count(struct il_priv *priv)
 {
 	/* # of Rx chains to use when expecting MIMO. */
-	if (iwl4965_is_single_rx_stream(priv))
-		return IWL_NUM_RX_CHAINS_SINGLE;
+	if (il4965_is_single_rx_stream(priv))
+		return IL_NUM_RX_CHAINS_SINGLE;
 	else
-		return IWL_NUM_RX_CHAINS_MULTIPLE;
+		return IL_NUM_RX_CHAINS_MULTIPLE;
 }
 
 /*
@@ -1034,13 +1034,13 @@ static int iwl4965_get_active_rx_chain_count(struct iwl_priv *priv)
  * multiplexing power save, use the active count for rx chain count.
  */
 static int
-iwl4965_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt)
+il4965_get_idle_rx_chain_count(struct il_priv *priv, int active_cnt)
 {
 	/* # Rx chains when idling, depending on SMPS mode */
 	switch (priv->current_ht_config.smps) {
 	case IEEE80211_SMPS_STATIC:
 	case IEEE80211_SMPS_DYNAMIC:
-		return IWL_NUM_IDLE_CHAINS_SINGLE;
+		return IL_NUM_IDLE_CHAINS_SINGLE;
 	case IEEE80211_SMPS_OFF:
 		return active_cnt;
 	default:
@@ -1051,7 +1051,7 @@ iwl4965_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt)
 }
 
 /* up to 4 chains */
-static u8 iwl4965_count_chain_bitmap(u32 chain_bitmap)
+static u8 il4965_count_chain_bitmap(u32 chain_bitmap)
 {
 	u8 res;
 	res = (chain_bitmap & BIT(0)) >> 0;
@@ -1062,14 +1062,14 @@ static u8 iwl4965_count_chain_bitmap(u32 chain_bitmap)
 }
 
 /**
- * iwl4965_set_rxon_chain - Set up Rx chain usage in "staging" RXON image
+ * il4965_set_rxon_chain - Set up Rx chain usage in "staging" RXON image
  *
  * Selects how many and which Rx receivers/antennas/chains to use.
  * This should not be used for scan command ... it puts data in wrong place.
  */
-void iwl4965_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
+void il4965_set_rxon_chain(struct il_priv *priv, struct il_rxon_context *ctx)
 {
-	bool is_single = iwl4965_is_single_rx_stream(priv);
+	bool is_single = il4965_is_single_rx_stream(priv);
 	bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status);
 	u8 idle_rx_cnt, active_rx_cnt, valid_rx_cnt;
 	u32 active_chains;
@@ -1077,7 +1077,7 @@ void iwl4965_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
 
 	/* Tell uCode which antennas are actually connected.
 	 * Before first association, we assume all antennas are connected.
-	 * Just after first association, iwl4965_chain_noise_calibration()
+	 * Just after first association, il4965_chain_noise_calibration()
 	 *    checks which antennas actually *are* connected. */
 	if (priv->chain_noise_data.active_chains)
 		active_chains = priv->chain_noise_data.active_chains;
@@ -1087,14 +1087,14 @@ void iwl4965_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
 	rx_chain = active_chains << RXON_RX_CHAIN_VALID_POS;
 
 	/* How many receivers should we use? */
-	active_rx_cnt = iwl4965_get_active_rx_chain_count(priv);
-	idle_rx_cnt = iwl4965_get_idle_rx_chain_count(priv, active_rx_cnt);
+	active_rx_cnt = il4965_get_active_rx_chain_count(priv);