iwlwifi: cleanup namespace

Prefix all symbols with iwl3945_ or iwl4965_ and thus allow building
the driver into the kernel. Also remove all the useless default
statements in Kconfig while we're at it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 225 insertions, 227 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.h b/drivers/net/wireless/iwlwifi/iwl-4965.h
index d61cf0e26e81..5944b4b9828b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.h
@@ -30,10 +30,10 @@
 #include <linux/kernel.h>
 #include <net/ieee80211_radiotap.h>
 
-struct iwl_priv;
+struct iwl4965_priv;
 
 /* Hardware specific file defines the PCI IDs table for that hardware module */
-extern struct pci_device_id iwl_hw_card_ids[];
+extern struct pci_device_id iwl4965_hw_card_ids[];
 
 #define DRV_NAME        "iwl4965"
 #include "iwl-4965-hw.h"
@@ -54,10 +54,10 @@ extern struct pci_device_id iwl_hw_card_ids[];
 #define IWL_NOISE_MEAS_NOT_AVAILABLE (-127)
 
 /* Module parameters accessible from iwl-*.c */
-extern int iwl_param_hwcrypto;
-extern int iwl_param_queues_num;
+extern int iwl4965_param_hwcrypto;
+extern int iwl4965_param_queues_num;
 
-enum iwl_antenna {
+enum iwl4965_antenna {
         IWL_ANTENNA_DIVERSITY,
         IWL_ANTENNA_MAIN,
         IWL_ANTENNA_AUX
@@ -80,13 +80,13 @@ enum iwl_antenna {
 #define DEFAULT_SHORT_RETRY_LIMIT 7U
 #define DEFAULT_LONG_RETRY_LIMIT  4U
 
-struct iwl_rx_mem_buffer {
+struct iwl4965_rx_mem_buffer {
         dma_addr_t dma_addr;
         struct sk_buff *skb;
         struct list_head list;
 };
 
-struct iwl_rt_rx_hdr {
+struct iwl4965_rt_rx_hdr {
         struct ieee80211_radiotap_header rt_hdr;
         __le64 rt_tsf;          /* TSF */
         u8 rt_flags;            /* radiotap packet flags */
@@ -99,7 +99,7 @@ struct iwl_rt_rx_hdr {
         u8 payload[0];          /* payload... */
 } __attribute__ ((packed));
 
-struct iwl_rt_tx_hdr {
+struct iwl4965_rt_tx_hdr {
         struct ieee80211_radiotap_header rt_hdr;
         u8 rt_rate;             /* rate in 500kb/s */
         __le16 rt_channel;      /* channel in mHz */
@@ -114,7 +114,7 @@ struct iwl_rt_tx_hdr {
  *
  * Contains common data for Rx and Tx queues
  */
-struct iwl_queue {
+struct iwl4965_queue {
         int n_bd;              /* number of BDs in this queue */
         int write_ptr;       /* 1-st empty entry (index) host_w*/
         int read_ptr;         /* last used entry (index) host_r*/
@@ -129,24 +129,24 @@ struct iwl_queue {
 
 #define MAX_NUM_OF_TBS          (20)
 
-struct iwl_tx_info {
+struct iwl4965_tx_info {
         struct ieee80211_tx_status status;
         struct sk_buff *skb[MAX_NUM_OF_TBS];
 };
 
 /**
- * struct iwl_tx_queue - Tx Queue for DMA
+ * struct iwl4965_tx_queue - Tx Queue for DMA
  * @need_update: need to update read/write index
  * @shed_retry: queue is HT AGG enabled
  *
  * Queue consists of circular buffer of BD's and required locking structures.
  */
-struct iwl_tx_queue {
-        struct iwl_queue q;
-        struct iwl_tfd_frame *bd;
-        struct iwl_cmd *cmd;
+struct iwl4965_tx_queue {
+        struct iwl4965_queue q;
+        struct iwl4965_tfd_frame *bd;
+        struct iwl4965_cmd *cmd;
         dma_addr_t dma_addr_cmd;
-        struct iwl_tx_info *txb;
+        struct iwl4965_tx_info *txb;
         int need_update;
         int sched_retry;
         int active;
@@ -154,12 +154,12 @@ struct iwl_tx_queue {
 
 #define IWL_NUM_SCAN_RATES         (2)
 
-struct iwl_channel_tgd_info {
+struct iwl4965_channel_tgd_info {
         u8 type;
         s8 max_power;
 };
 
-struct iwl_channel_tgh_info {
+struct iwl4965_channel_tgh_info {
         s64 last_radar_time;
 };
 
@@ -170,8 +170,8 @@ struct iwl_channel_tgh_info {
  * -- spectrum management
  * -- user preference (e.g. iwconfig)
  * when requested power is set, base power index must also be set. */
-struct iwl_channel_power_info {
-        struct iwl_tx_power tpc;        /* actual radio and DSP gain settings */
+struct iwl4965_channel_power_info {
+        struct iwl4965_tx_power tpc;    /* actual radio and DSP gain settings */
         s8 power_table_index;   /* actual (compenst'd) index into gain table */
         s8 base_power_index;    /* gain index for power at factory temp. */
         s8 requested_power;     /* power (dBm) requested for this chnl/rate */
@@ -179,8 +179,8 @@ struct iwl_channel_power_info {
 
 /* current scan Tx power values to use, one for each scan rate for each
  * channel. */
-struct iwl_scan_power_info {
-        struct iwl_tx_power tpc;        /* actual radio and DSP gain settings */
+struct iwl4965_scan_power_info {
+        struct iwl4965_tx_power tpc;    /* actual radio and DSP gain settings */
         s8 power_table_index;   /* actual (compenst'd) index into gain table */
         s8 requested_power;     /* scan pwr (dBm) requested for chnl/rate */
 };
@@ -200,11 +200,11 @@ struct iwl_scan_power_info {
  */
 #define IWL4965_MAX_RATE (33)
 
-struct iwl_channel_info {
-        struct iwl_channel_tgd_info tgd;
-        struct iwl_channel_tgh_info tgh;
-        struct iwl_eeprom_channel eeprom;       /* EEPROM regulatory limit */
-        struct iwl_eeprom_channel fat_eeprom;   /* EEPROM regulatory limit for
+struct iwl4965_channel_info {
+        struct iwl4965_channel_tgd_info tgd;
+        struct iwl4965_channel_tgh_info tgh;
+        struct iwl4965_eeprom_channel eeprom;   /* EEPROM regulatory limit */
+        struct iwl4965_eeprom_channel fat_eeprom;       /* EEPROM regulatory limit for
                                                  * FAT channel */
 
         u8 channel;       /* channel number */
@@ -221,7 +221,7 @@ struct iwl_channel_info {
         /* Radio/DSP gain settings for each "normal" data Tx rate.
          * These include, in addition to RF and DSP gain, a few fields for
          *   remembering/modifying gain settings (indexes). */
-        struct iwl_channel_power_info power_info[IWL4965_MAX_RATE];
+        struct iwl4965_channel_power_info power_info[IWL4965_MAX_RATE];
 
         /* FAT channel info */
         s8 fat_max_power_avg;   /* (dBm) regul. eeprom, normal Tx, any rate */
@@ -232,10 +232,10 @@ struct iwl_channel_info {
         u8 fat_extension_channel;
 
         /* Radio/DSP gain settings for each scan rate, for directed scans. */
-        struct iwl_scan_power_info scan_pwr_info[IWL_NUM_SCAN_RATES];
+        struct iwl4965_scan_power_info scan_pwr_info[IWL_NUM_SCAN_RATES];
 };
 
-struct iwl_clip_group {
+struct iwl4965_clip_group {
         /* maximum power level to prevent clipping for each rate, derived by
          *   us from this band's saturation power in EEPROM */
         const s8 clip_powers[IWL_MAX_RATES];
@@ -256,8 +256,8 @@ struct iwl_clip_group {
 
 /* Power management (not Tx power) structures */
 
-struct iwl_power_vec_entry {
-        struct iwl_powertable_cmd cmd;
+struct iwl4965_power_vec_entry {
+        struct iwl4965_powertable_cmd cmd;
         u8 no_dtim;
 };
 #define IWL_POWER_RANGE_0  (0)
@@ -273,10 +273,10 @@ struct iwl_power_vec_entry {
 #define IWL_POWER_ENABLED       0x10
 #define IWL_POWER_LEVEL(x)      ((x) & IWL_POWER_MASK)
 
-struct iwl_power_mgr {
+struct iwl4965_power_mgr {
         spinlock_t lock;
-        struct iwl_power_vec_entry pwr_range_0[IWL_POWER_AC];
-        struct iwl_power_vec_entry pwr_range_1[IWL_POWER_AC];
+        struct iwl4965_power_vec_entry pwr_range_0[IWL_POWER_AC];
+        struct iwl4965_power_vec_entry pwr_range_1[IWL_POWER_AC];
         u8 active_index;
         u32 dtim_val;
 };
@@ -286,10 +286,10 @@ struct iwl_power_mgr {
 #define IEEE80211_HLEN                  (IEEE80211_4ADDR_LEN)
 #define IEEE80211_FRAME_LEN             (IEEE80211_DATA_LEN + IEEE80211_HLEN)
 
-struct iwl_frame {
+struct iwl4965_frame {
         union {
                 struct ieee80211_hdr frame;
-                struct iwl_tx_beacon_cmd beacon;
+                struct iwl4965_tx_beacon_cmd beacon;
                 u8 raw[IEEE80211_FRAME_LEN];
                 u8 cmd[360];
         } u;
@@ -315,15 +315,15 @@ enum {
         CMD_WANT_SKB = (1 << 2),
 };
 
-struct iwl_cmd;
-struct iwl_priv;
+struct iwl4965_cmd;
+struct iwl4965_priv;
 
-struct iwl_cmd_meta {
-        struct iwl_cmd_meta *source;
+struct iwl4965_cmd_meta {
+        struct iwl4965_cmd_meta *source;
         union {
                 struct sk_buff *skb;
-                int (*callback)(struct iwl_priv *priv,
-                                struct iwl_cmd *cmd, struct sk_buff *skb);
+                int (*callback)(struct iwl4965_priv *priv,
+                                struct iwl4965_cmd *cmd, struct sk_buff *skb);
         } __attribute__ ((packed)) u;
 
         /* The CMD_SIZE_HUGE flag bit indicates that the command
@@ -332,37 +332,37 @@ struct iwl_cmd_meta {
 
 } __attribute__ ((packed));
 
-struct iwl_cmd {
-        struct iwl_cmd_meta meta;
-        struct iwl_cmd_header hdr;
+struct iwl4965_cmd {
+        struct iwl4965_cmd_meta meta;
+        struct iwl4965_cmd_header hdr;
         union {
-                struct iwl_addsta_cmd addsta;
-                struct iwl_led_cmd led;
+                struct iwl4965_addsta_cmd addsta;
+                struct iwl4965_led_cmd led;
                 u32 flags;
                 u8 val8;
                 u16 val16;
                 u32 val32;
-                struct iwl_bt_cmd bt;
-                struct iwl_rxon_time_cmd rxon_time;
-                struct iwl_powertable_cmd powertable;
-                struct iwl_qosparam_cmd qosparam;
-                struct iwl_tx_cmd tx;
-                struct iwl_tx_beacon_cmd tx_beacon;
-                struct iwl_rxon_assoc_cmd rxon_assoc;
+                struct iwl4965_bt_cmd bt;
+                struct iwl4965_rxon_time_cmd rxon_time;
+                struct iwl4965_powertable_cmd powertable;
+                struct iwl4965_qosparam_cmd qosparam;
+                struct iwl4965_tx_cmd tx;
+                struct iwl4965_tx_beacon_cmd tx_beacon;
+                struct iwl4965_rxon_assoc_cmd rxon_assoc;
                 u8 *indirect;
                 u8 payload[360];
         } __attribute__ ((packed)) cmd;
 } __attribute__ ((packed));
 
-struct iwl_host_cmd {
+struct iwl4965_host_cmd {
         u8 id;
         u16 len;
-        struct iwl_cmd_meta meta;
+        struct iwl4965_cmd_meta meta;
         const void *data;
 };
 
-#define TFD_MAX_PAYLOAD_SIZE (sizeof(struct iwl_cmd) - \
-                              sizeof(struct iwl_cmd_meta))
+#define TFD_MAX_PAYLOAD_SIZE (sizeof(struct iwl4965_cmd) - \
+                              sizeof(struct iwl4965_cmd_meta))
 
 /*
  * RX related structures and functions
@@ -375,7 +375,7 @@ struct iwl_host_cmd {
 #define SUP_RATE_11G_MAX_NUM_CHANNELS  12
 
 /**
- * struct iwl_rx_queue - Rx queue
+ * struct iwl4965_rx_queue - Rx queue
  * @processed: Internal index to last handled Rx packet
  * @read: Shared index to newest available Rx buffer
  * @write: Shared index to oldest written Rx packet
@@ -384,13 +384,13 @@ struct iwl_host_cmd {
  * @rx_used: List of Rx buffers with no SKB
  * @need_update: flag to indicate we need to update read/write index
  *
- * NOTE:  rx_free and rx_used are used as a FIFO for iwl_rx_mem_buffers
+ * NOTE:  rx_free and rx_used are used as a FIFO for iwl4965_rx_mem_buffers
  */
-struct iwl_rx_queue {
+struct iwl4965_rx_queue {
         __le32 *bd;
         dma_addr_t dma_addr;
-        struct iwl_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];
-        struct iwl_rx_mem_buffer *queue[RX_QUEUE_SIZE];
+        struct iwl4965_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];
+        struct iwl4965_rx_mem_buffer *queue[RX_QUEUE_SIZE];
         u32 processed;
         u32 read;
         u32 write;
@@ -436,7 +436,7 @@ struct iwl_rx_queue {
 
 #ifdef CONFIG_IWL4965_HT
 #ifdef CONFIG_IWL4965_HT_AGG
-struct iwl_ht_agg {
+struct iwl4965_ht_agg {
         u16 txq_id;
         u16 frame_count;
         u16 wait_for_ba;
@@ -448,22 +448,22 @@ struct iwl_ht_agg {
 #endif /* CONFIG_IWL4965_HT_AGG */
 #endif /* CONFIG_IWL4965_HT */
 
-struct iwl_tid_data {
+struct iwl4965_tid_data {
         u16 seq_number;
 #ifdef CONFIG_IWL4965_HT
 #ifdef CONFIG_IWL4965_HT_AGG
-        struct iwl_ht_agg agg;
+        struct iwl4965_ht_agg agg;
 #endif  /* CONFIG_IWL4965_HT_AGG */
 #endif /* CONFIG_IWL4965_HT */
 };
 
-struct iwl_hw_key {
+struct iwl4965_hw_key {
         enum ieee80211_key_alg alg;
         int keylen;
         u8 key[32];
 };
 
-union iwl_ht_rate_supp {
+union iwl4965_ht_rate_supp {
         u16 rates;
         struct {
                 u8 siso_rate;
@@ -498,7 +498,7 @@ struct sta_ht_info {
 
 #ifdef CONFIG_IWL4965_QOS
 
-union iwl_qos_capabity {
+union iwl4965_qos_capabity {
         struct {
                 u8 edca_count:4;        /* bit 0-3 */
                 u8 q_ack:1;             /* bit 4 */
@@ -519,23 +519,23 @@ union iwl_qos_capabity {
 };
 
 /* QoS structures */
-struct iwl_qos_info {
+struct iwl4965_qos_info {
         int qos_enable;
         int qos_active;
-        union iwl_qos_capabity qos_cap;
-        struct iwl_qosparam_cmd def_qos_parm;
+        union iwl4965_qos_capabity qos_cap;
+        struct iwl4965_qosparam_cmd def_qos_parm;
 };
 #endif /*CONFIG_IWL4965_QOS */
 
 #define STA_PS_STATUS_WAKE             0
 #define STA_PS_STATUS_SLEEP            1
 
-struct iwl_station_entry {
-        struct iwl_addsta_cmd sta;
-        struct iwl_tid_data tid[MAX_TID_COUNT];
+struct iwl4965_station_entry {
+        struct iwl4965_addsta_cmd sta;
+        struct iwl4965_tid_data tid[MAX_TID_COUNT];
         u8 used;
         u8 ps_status;
-        struct iwl_hw_key keyinfo;
+        struct iwl4965_hw_key keyinfo;
 };
 
 /* one for each uCode image (inst/data, boot/init/runtime) */
@@ -546,7 +546,7 @@ struct fw_desc {
 };
 
 /* uCode file layout */
-struct iwl_ucode {
+struct iwl4965_ucode {
         __le32 ver;             /* major/minor/subminor */
         __le32 inst_size;       /* bytes of runtime instructions */
         __le32 data_size;       /* bytes of runtime data */
@@ -558,7 +558,7 @@ struct iwl_ucode {
 
 #define IWL_IBSS_MAC_HASH_SIZE 32
 
-struct iwl_ibss_seq {
+struct iwl4965_ibss_seq {
         u8 mac[ETH_ALEN];
         u16 seq_num;
         u16 frag_num;
@@ -566,7 +566,7 @@ struct iwl_ibss_seq {
         struct list_head list;
 };
 
-struct iwl_driver_hw_info {
+struct iwl4965_driver_hw_info {
         u16 max_txq_num;
         u16 ac_queue_count;
         u16 tx_cmd_len;
@@ -592,10 +592,10 @@ struct iwl_driver_hw_info {
 #define HT_SHORT_GI_40MHZ_ONLY          (1 << 1)
 
 
-#define IWL_RX_HDR(x) ((struct iwl_rx_frame_hdr *)(\
+#define IWL_RX_HDR(x) ((struct iwl4965_rx_frame_hdr *)(\
                        x->u.rx_frame.stats.payload + \
                        x->u.rx_frame.stats.phy_count))
-#define IWL_RX_END(x) ((struct iwl_rx_frame_end *)(\
+#define IWL_RX_END(x) ((struct iwl4965_rx_frame_end *)(\
                        IWL_RX_HDR(x)->payload + \
                        le16_to_cpu(IWL_RX_HDR(x)->len)))
 #define IWL_RX_STATS(x) (&x->u.rx_frame.stats)
@@ -608,63 +608,63 @@ struct iwl_driver_hw_info {
  * for use by iwl-*.c
  *
  *****************************************************************************/
-struct iwl_addsta_cmd;
-extern int iwl_send_add_station(struct iwl_priv *priv,
-                                struct iwl_addsta_cmd *sta, u8 flags);
-extern u8 iwl_add_station(struct iwl_priv *priv, const u8 *bssid,
+struct iwl4965_addsta_cmd;
+extern int iwl4965_send_add_station(struct iwl4965_priv *priv,
+                                struct iwl4965_addsta_cmd *sta, u8 flags);
+extern u8 iwl4965_add_station_flags(struct iwl4965_priv *priv, const u8 *bssid,
                           int is_ap, u8 flags);
-extern int iwl_is_network_packet(struct iwl_priv *priv,
+extern int iwl4965_is_network_packet(struct iwl4965_priv *priv,
                                  struct ieee80211_hdr *header);
-extern int iwl_power_init_handle(struct iwl_priv *priv);
-extern int iwl_eeprom_init(struct iwl_priv *priv);
+extern int iwl4965_power_init_handle(struct iwl4965_priv *priv);
+extern int iwl4965_eeprom_init(struct iwl4965_priv *priv);
 #ifdef CONFIG_IWL4965_DEBUG
-extern void iwl_report_frame(struct iwl_priv *priv,
-                             struct iwl_rx_packet *pkt,
+extern void iwl4965_report_frame(struct iwl4965_priv *priv,
+                             struct iwl4965_rx_packet *pkt,
                              struct ieee80211_hdr *header, int group100);
 #else
-static inline void iwl_report_frame(struct iwl_priv *priv,
-                                    struct iwl_rx_packet *pkt,
+static inline void iwl4965_report_frame(struct iwl4965_priv *priv,
+                                    struct iwl4965_rx_packet *pkt,
                                     struct ieee80211_hdr *header,
                                     int group100) {}
 #endif
-extern void iwl_handle_data_packet_monitor(struct iwl_priv *priv,
-                                           struct iwl_rx_mem_buffer *rxb,
+extern void iwl4965_handle_data_packet_monitor(struct iwl4965_priv *priv,
+                                           struct iwl4965_rx_mem_buffer *rxb,
                                            void *data, short len,
                                            struct ieee80211_rx_status *stats,
                                            u16 phy_flags);
-extern int is_duplicate_packet(struct iwl_priv *priv, struct ieee80211_hdr
-                               *header);
-extern int iwl_rx_queue_alloc(struct iwl_priv *priv);
-extern void iwl_rx_queue_reset(struct iwl_priv *priv,
-                               struct iwl_rx_queue *rxq);
-extern int iwl_calc_db_from_ratio(int sig_ratio);
-extern int iwl_calc_sig_qual(int rssi_dbm, int noise_dbm);
-extern int iwl_tx_queue_init(struct iwl_priv *priv,
-                             struct iwl_tx_queue *txq, int count, u32 id);
-extern void iwl_rx_replenish(void *data);
-extern void iwl_tx_queue_free(struct iwl_priv *priv, struct iwl_tx_queue *txq);
-extern int iwl_send_cmd_pdu(struct iwl_priv *priv, u8 id, u16 len,
+extern int iwl4965_is_duplicate_packet(struct iwl4965_priv *priv,
+                                       struct ieee80211_hdr *header);
+extern int iwl4965_rx_queue_alloc(struct iwl4965_priv *priv);
+extern void iwl4965_rx_queue_reset(struct iwl4965_priv *priv,
+                               struct iwl4965_rx_queue *rxq);
+extern int iwl4965_calc_db_from_ratio(int sig_ratio);
+extern int iwl4965_calc_sig_qual(int rssi_dbm, int noise_dbm);
+extern int iwl4965_tx_queue_init(struct iwl4965_priv *priv,
+                             struct iwl4965_tx_queue *txq, int count, u32 id);
+extern void iwl4965_rx_replenish(void *data);
+extern void iwl4965_tx_queue_free(struct iwl4965_priv *priv, struct iwl4965_tx_queue *txq);
+extern int iwl4965_send_cmd_pdu(struct iwl4965_priv *priv, u8 id, u16 len,
                             const void *data);
-extern int __must_check iwl_send_cmd(struct iwl_priv *priv,
-                struct iwl_host_cmd *cmd);
-extern unsigned int iwl_fill_beacon_frame(struct iwl_priv *priv,
+extern int __must_check iwl4965_send_cmd(struct iwl4965_priv *priv,
+                struct iwl4965_host_cmd *cmd);
+extern unsigned int iwl4965_fill_beacon_frame(struct iwl4965_priv *priv,
                                         struct ieee80211_hdr *hdr,
                                         const u8 *dest, int left);
-extern int iwl_rx_queue_update_write_ptr(struct iwl_priv *priv,
-                                         struct iwl_rx_queue *q);
-extern int iwl_send_statistics_request(struct iwl_priv *priv);
-extern void iwl_set_decrypted_flag(struct iwl_priv *priv, struct sk_buff *skb,
+extern int iwl4965_rx_queue_update_write_ptr(struct iwl4965_priv *priv,
+                                         struct iwl4965_rx_queue *q);
+extern int iwl4965_send_statistics_request(struct iwl4965_priv *priv);
+extern void iwl4965_set_decrypted_flag(struct iwl4965_priv *priv, struct sk_buff *skb,
                                    u32 decrypt_res,
                                    struct ieee80211_rx_status *stats);
 extern __le16 *ieee80211_get_qos_ctrl(struct ieee80211_hdr *hdr);
 
-extern const u8 BROADCAST_ADDR[ETH_ALEN];
+extern const u8 iwl4965_broadcast_addr[ETH_ALEN];
 
 /*
  * Currently used by iwl-3945-rs... look at restructuring so that it doesn't
  * call this... todo... fix that.
 */
-extern u8 iwl_sync_station(struct iwl_priv *priv, int sta_id,
+extern u8 iwl4965_sync_station(struct iwl4965_priv *priv, int sta_id,
                            u16 tx_rate, u8 flags);
 
 /******************************************************************************
@@ -676,112 +676,110 @@ extern u8 iwl_sync_station(struct iwl_priv *priv, int sta_id,
  * which is why they are in the hardware specific files (vs. iwl-base.c)
  *
  * Naming convention --
- * iwl_         <-- Its part of iwlwifi (should be changed to iwl_)
- * iwl_hw_      <-- Hardware specific (implemented in iwl-XXXX.c by all HW)
+ * iwl4965_         <-- Its part of iwlwifi (should be changed to iwl4965_)
+ * iwl4965_hw_      <-- Hardware specific (implemented in iwl-XXXX.c by all HW)
  * iwlXXXX_     <-- Hardware specific (implemented in iwl-XXXX.c for XXXX)
- * iwl_bg_      <-- Called from work queue context
- * iwl_mac_     <-- mac80211 callback
+ * iwl4965_bg_      <-- Called from work queue context
+ * iwl4965_mac_     <-- mac80211 callback
  *
  ****************************************************************************/
-extern void iwl_hw_rx_handler_setup(struct iwl_priv *priv);
-extern void iwl_hw_setup_deferred_work(struct iwl_priv *priv);
-extern void iwl_hw_cancel_deferred_work(struct iwl_priv *priv);
-extern int iwl_hw_rxq_stop(struct iwl_priv *priv);
-extern int iwl_hw_set_hw_setting(struct iwl_priv *priv);
-extern int iwl_hw_nic_init(struct iwl_priv *priv);
-extern int iwl_hw_nic_stop_master(struct iwl_priv *priv);
-extern void iwl_hw_txq_ctx_free(struct iwl_priv *priv);
-extern void iwl_hw_txq_ctx_stop(struct iwl_priv *priv);
-extern int iwl_hw_nic_reset(struct iwl_priv *priv);
-extern int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *tfd,
+extern void iwl4965_hw_rx_handler_setup(struct iwl4965_priv *priv);
+extern void iwl4965_hw_setup_deferred_work(struct iwl4965_priv *priv);
+extern void iwl4965_hw_cancel_deferred_work(struct iwl4965_priv *priv);
+extern int iwl4965_hw_rxq_stop(struct iwl4965_priv *priv);
+extern int iwl4965_hw_set_hw_setting(struct iwl4965_priv *priv);
+extern int iwl4965_hw_nic_init(struct iwl4965_priv *priv);
+extern int iwl4965_hw_nic_stop_master(struct iwl4965_priv *priv);
+extern void iwl4965_hw_txq_ctx_free(struct iwl4965_priv *priv);
+extern void iwl4965_hw_txq_ctx_stop(struct iwl4965_priv *priv);
+extern int iwl4965_hw_nic_reset(struct iwl4965_priv *priv);
+extern int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl4965_priv *priv, void *tfd,
                                         dma_addr_t addr, u16 len);
-extern int iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq);
-extern int iwl_hw_get_temperature(struct iwl_priv *priv);
-extern int iwl_hw_tx_queue_init(struct iwl_priv *priv,
-                                struct iwl_tx_queue *txq);
-extern unsigned int iwl_hw_get_beacon_cmd(struct iwl_priv *priv,
-                                 struct iwl_frame *frame, u8 rate);
-extern int iwl_hw_get_rx_read(struct iwl_priv *priv);
-extern void iwl_hw_build_tx_cmd_rate(struct iwl_priv *priv,
-                                     struct iwl_cmd *cmd,
+extern int iwl4965_hw_txq_free_tfd(struct iwl4965_priv *priv, struct iwl4965_tx_queue *txq);
+extern int iwl4965_hw_get_temperature(struct iwl4965_priv *priv);
+extern int iwl4965_hw_tx_queue_init(struct iwl4965_priv *priv,
+                                struct iwl4965_tx_queue *txq);
+extern unsigned int iwl4965_hw_get_beacon_cmd(struct iwl4965_priv *priv,
+                                 struct iwl4965_frame *frame, u8 rate);
+extern int iwl4965_hw_get_rx_read(struct iwl4965_priv *priv);
+extern void iwl4965_hw_build_tx_cmd_rate(struct iwl4965_priv *priv,
+                                     struct iwl4965_cmd *cmd,
                                      struct ieee80211_tx_control *ctrl,
                                      struct ieee80211_hdr *hdr,
                                      int sta_id, int tx_id);
-extern int iwl_hw_reg_send_txpower(struct iwl_priv *priv);
-extern int iwl_hw_reg_set_txpower(struct iwl_priv *priv, s8 power);
-extern void iwl_hw_rx_statistics(struct iwl_priv *priv,
-                                 struct iwl_rx_mem_buffer *rxb);
-extern void iwl_disable_events(struct iwl_priv *priv);
-extern int iwl4965_get_temperature(const struct iwl_priv *priv);
+extern int iwl4965_hw_reg_send_txpower(struct iwl4965_priv *priv);
+extern int iwl4965_hw_reg_set_txpower(struct iwl4965_priv *priv, s8 power);
+extern void iwl4965_hw_rx_statistics(struct iwl4965_priv *priv,
+                                 struct iwl4965_rx_mem_buffer *rxb);
+extern void iwl4965_disable_events(struct iwl4965_priv *priv);
+extern int iwl4965_get_temperature(const struct iwl4965_priv *priv);
 
 /**
- * iwl_hw_find_station - Find station id for a given BSSID
+ * iwl4965_hw_find_station - Find station id for a given BSSID
  * @bssid: MAC address of station ID to find
  *
  * NOTE:  This should not be hardware specific but the code has
  * not yet been merged into a single common layer for managing the
  * station tables.
  */
-extern u8 iwl_hw_find_station(struct iwl_priv *priv, const u8 *bssid);
+extern u8 iwl4965_hw_find_station(struct iwl4965_priv *priv, const u8 *bssid);
 
-extern int iwl_hw_channel_switch(struct iwl_priv *priv, u16 channel);
-extern int iwl_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index);
+extern int iwl4965_hw_channel_switch(struct iwl4965_priv *priv, u16 channel);
+extern int iwl4965_tx_queue_reclaim(struct iwl4965_priv *priv, int txq_id, int index);
 
-struct iwl_priv;
+struct iwl4965_priv;
 struct sta_ht_info;
 
 /*
  * Forward declare iwl-4965.c functions for iwl-base.c
  */
-extern int iwl_eeprom_acquire_semaphore(struct iwl_priv *priv);
-extern void iwl_eeprom_release_semaphore(struct iwl_priv *priv);
+extern int iwl4965_eeprom_acquire_semaphore(struct iwl4965_priv *priv);
+extern void iwl4965_eeprom_release_semaphore(struct iwl4965_priv *priv);
 
-extern int iwl4965_tx_queue_update_wr_ptr(struct iwl_priv *priv,
-                                          struct iwl_tx_queue *txq,
+extern int iwl4965_tx_queue_update_wr_ptr(struct iwl4965_priv *priv,
+                                          struct iwl4965_tx_queue *txq,
                                           u16 byte_cnt);
-extern void iwl4965_add_station(struct iwl_priv *priv, const u8 *addr,
+extern void iwl4965_add_station(struct iwl4965_priv *priv, const u8 *addr,
                                 int is_ap);
-extern void iwl4965_set_rxon_ht(struct iwl_priv *priv,
+extern void iwl4965_set_rxon_ht(struct iwl4965_priv *priv,
                                 struct sta_ht_info *ht_info);
 
-extern void iwl4965_set_rxon_chain(struct iwl_priv *priv);
-extern int iwl4965_tx_cmd(struct iwl_priv *priv, struct iwl_cmd *out_cmd,
+extern void iwl4965_set_rxon_chain(struct iwl4965_priv *priv);
+extern int iwl4965_tx_cmd(struct iwl4965_priv *priv, struct iwl4965_cmd *out_cmd,
                           u8 sta_id, dma_addr_t txcmd_phys,
                           struct ieee80211_hdr *hdr, u8 hdr_len,
                           struct ieee80211_tx_control *ctrl, void *sta_in);
-extern int iwl4965_init_hw_rates(struct iwl_priv *priv,
-                                 struct ieee80211_rate *rates);
-extern int iwl4965_alive_notify(struct iwl_priv *priv);
-extern void iwl4965_update_rate_scaling(struct iwl_priv *priv, u8 mode);
-extern void iwl4965_set_ht_add_station(struct iwl_priv *priv, u8 index);
-
-extern void iwl4965_chain_noise_reset(struct iwl_priv *priv);
-extern void iwl4965_init_sensitivity(struct iwl_priv *priv, u8 flags,
+extern int iwl4965_alive_notify(struct iwl4965_priv *priv);
+extern void iwl4965_update_rate_scaling(struct iwl4965_priv *priv, u8 mode);
+extern void iwl4965_set_ht_add_station(struct iwl4965_priv *priv, u8 index);
+
+extern void iwl4965_chain_noise_reset(struct iwl4965_priv *priv);
+extern void iwl4965_init_sensitivity(struct iwl4965_priv *priv, u8 flags,
                                      u8 force);
-extern int iwl4965_set_fat_chan_info(struct iwl_priv *priv, int phymode,
+extern int iwl4965_set_fat_chan_info(struct iwl4965_priv *priv, int phymode,
                                 u16 channel,
-                                const struct iwl_eeprom_channel *eeprom_ch,
+                                const struct iwl4965_eeprom_channel *eeprom_ch,
                                 u8 fat_extension_channel);
-extern void iwl4965_rf_kill_ct_config(struct iwl_priv *priv);
+extern void iwl4965_rf_kill_ct_config(struct iwl4965_priv *priv);
 
 #ifdef CONFIG_IWL4965_HT
 #ifdef CONFIG_IWL4965_HT_AGG
-extern int iwl_mac_ht_tx_agg_start(struct ieee80211_hw *hw, u8 *da,
+extern int iwl4965_mac_ht_tx_agg_start(struct ieee80211_hw *hw, u8 *da,
                                    u16 tid, u16 *start_seq_num);
-extern int iwl_mac_ht_rx_agg_start(struct ieee80211_hw *hw, u8 *da,
+extern int iwl4965_mac_ht_rx_agg_start(struct ieee80211_hw *hw, u8 *da,
                                    u16 tid, u16 start_seq_num);
-extern int iwl_mac_ht_rx_agg_stop(struct ieee80211_hw *hw, u8 *da,
+extern int iwl4965_mac_ht_rx_agg_stop(struct ieee80211_hw *hw, u8 *da,
                                   u16 tid, int generator);
-extern int iwl_mac_ht_tx_agg_stop(struct ieee80211_hw *hw, u8 *da,
+extern int iwl4965_mac_ht_tx_agg_stop(struct ieee80211_hw *hw, u8 *da,
                                   u16 tid, int generator);
-extern void iwl4965_turn_off_agg(struct iwl_priv *priv, u8 tid);
+extern void iwl4965_turn_off_agg(struct iwl4965_priv *priv, u8 tid);
 #endif /* CONFIG_IWL4965_HT_AGG */
 #endif /*CONFIG_IWL4965_HT */
 /* Structures, enum, and defines specific to the 4965 */
 
 #define IWL4965_KW_SIZE 0x1000  /*4k */
 
-struct iwl_kw {
+struct iwl4965_kw {
         dma_addr_t dma_addr;
         void *v_addr;
         size_t size;
@@ -835,7 +833,7 @@ struct iwl_kw {
 #define IWL_TX_POWER_CCK_COMPENSATION_B_STEP (9)
 #define IWL_TX_POWER_CCK_COMPENSATION_C_STEP (5)
 
-struct iwl_traffic_load {
+struct iwl4965_traffic_load {
         unsigned long time_stamp;
         u32 packet_count[TID_QUEUE_MAX_SIZE];
         u8 queue_count;
@@ -844,7 +842,7 @@ struct iwl_traffic_load {
 };
 
 #ifdef CONFIG_IWL4965_HT_AGG
-struct iwl_agg_control {
+struct iwl4965_agg_control {
         unsigned long next_retry;
         u32 wait_for_agg_status;
         u32 tid_retry;
@@ -853,13 +851,13 @@ struct iwl_agg_control {
         u8 auto_agg;
         u32 tid_traffic_load_threshold;
         u32 ba_timeout;
-        struct iwl_traffic_load traffic_load[TID_MAX_LOAD_COUNT];
+        struct iwl4965_traffic_load traffic_load[TID_MAX_LOAD_COUNT];
 };
 #endif                          /*CONFIG_IWL4965_HT_AGG */
 
-struct iwl_lq_mngr {
+struct iwl4965_lq_mngr {
 #ifdef CONFIG_IWL4965_HT_AGG
-        struct iwl_agg_control agg_ctrl;
+        struct iwl4965_agg_control agg_ctrl;
 #endif
         spinlock_t lock;
         s32 max_window_size;
@@ -940,24 +938,24 @@ struct iwl_lq_mngr {
 #define IN_BAND_FILTER                  0xFF
 #define MIN_AVERAGE_NOISE_MAX_VALUE     0xFFFFFFFF
 
-enum iwl_false_alarm_state {
+enum iwl4965_false_alarm_state {
         IWL_FA_TOO_MANY = 0,
         IWL_FA_TOO_FEW = 1,
         IWL_FA_GOOD_RANGE = 2,
 };
 
-enum iwl_chain_noise_state {
+enum iwl4965_chain_noise_state {
         IWL_CHAIN_NOISE_ALIVE = 0,  /* must be 0 */
         IWL_CHAIN_NOISE_ACCUMULATE = 1,
         IWL_CHAIN_NOISE_CALIBRATED = 2,
 };
 
-enum iwl_sensitivity_state {
+enum iwl4965_sensitivity_state {
         IWL_SENS_CALIB_ALLOWED = 0,
         IWL_SENS_CALIB_NEED_REINIT = 1,
 };
 
-enum iwl_calib_enabled_state {
+enum iwl4965_calib_enabled_state {
         IWL_CALIB_DISABLED = 0,  /* must be 0 */
         IWL_CALIB_ENABLED = 1,
 };
@@ -972,7 +970,7 @@ struct statistics_general_data {
 };
 
 /* Sensitivity calib data */
-struct iwl_sensitivity_data {
+struct iwl4965_sensitivity_data {
         u32 auto_corr_ofdm;
         u32 auto_corr_ofdm_mrc;
         u32 auto_corr_ofdm_x1;
@@ -1001,7 +999,7 @@ struct iwl_sensitivity_data {
 };
 
 /* Chain noise (differential Rx gain) calib data */
-struct iwl_chain_noise_data {
+struct iwl4965_chain_noise_data {
         u8 state;
         u16 beacon_count;
         u32 chain_noise_a;
@@ -1049,7 +1047,7 @@ enum {
 
 #endif
 
-struct iwl_priv {
+struct iwl4965_priv {
 
         /* ieee device used by generic ieee processing code */
         struct ieee80211_hw *hw;
@@ -1063,27 +1061,27 @@ struct iwl_priv {
         u8 phymode;
         int alloc_rxb_skb;
 
-        void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,
-                                       struct iwl_rx_mem_buffer *rxb);
+        void (*rx_handlers[REPLY_MAX])(struct iwl4965_priv *priv,
+                                       struct iwl4965_rx_mem_buffer *rxb);
 
         const struct ieee80211_hw_mode *modes;
 
 #ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT
         /* spectrum measurement report caching */
-        struct iwl_spectrum_notification measure_report;
+        struct iwl4965_spectrum_notification measure_report;
         u8 measurement_status;
 #endif
         /* ucode beacon time */
         u32 ucode_beacon_time;
 
-        /* we allocate array of iwl_channel_info for NIC's valid channels.
+        /* we allocate array of iwl4965_channel_info for NIC's valid channels.
          *    Access via channel # using indirect index array */
-        struct iwl_channel_info *channel_info;  /* channel info array */
+        struct iwl4965_channel_info *channel_info;      /* channel info array */
         u8 channel_count;       /* # of channels */
 
         /* each calibration channel group in the EEPROM has a derived
          * clip setting for each rate. */
-        const struct iwl_clip_group clip_groups[5];
+        const struct iwl4965_clip_group clip_groups[5];
 
         /* thermal calibration */
         s32 temperature;        /* degrees Kelvin */
@@ -1098,7 +1096,7 @@ struct iwl_priv {
         int one_direct_scan;
         u8 direct_ssid_len;
         u8 direct_ssid[IW_ESSID_MAX_SIZE];
-        struct iwl_scan_cmd *scan;
+        struct iwl4965_scan_cmd *scan;
         u8 only_active_channel;
 
         /* spinlock */
@@ -1121,26 +1119,26 @@ struct iwl_priv {
         struct fw_desc ucode_boot;      /* bootstrap inst */
 
 
-        struct iwl_rxon_time_cmd rxon_timing;
+        struct iwl4965_rxon_time_cmd rxon_timing;
 
         /* We declare this const so it can only be
          * changed via explicit cast within the
          * routines that actually update the physical
          * hardware */
-        const struct iwl_rxon_cmd active_rxon;
-        struct iwl_rxon_cmd staging_rxon;
+        const struct iwl4965_rxon_cmd active_rxon;
+        struct iwl4965_rxon_cmd staging_rxon;
 
         int error_recovering;
-        struct iwl_rxon_cmd recovery_rxon;
+        struct iwl4965_rxon_cmd recovery_rxon;
 
         /* 1st responses from initialize and runtime uCode images.
          * 4965's initialize alive response contains some calibration data. */
-        struct iwl_init_alive_resp card_alive_init;
-        struct iwl_alive_resp card_alive;
+        struct iwl4965_init_alive_resp card_alive_init;
+        struct iwl4965_alive_resp card_alive;
 
 #ifdef LED
         /* LED related variables */
-        struct iwl_activity_blink activity;
+        struct iwl4965_activity_blink activity;
         unsigned long led_packets;
         int led_state;
 #endif
@@ -1158,8 +1156,8 @@ struct iwl_priv {
         u8 current_channel_width;
         u8 valid_antenna;       /* Bit mask of antennas actually connected */
 #ifdef CONFIG_IWL4965_SENSITIVITY
-        struct iwl_sensitivity_data sensitivity_data;
-        struct iwl_chain_noise_data chain_noise_data;
+        struct iwl4965_sensitivity_data sensitivity_data;
+        struct iwl4965_chain_noise_data chain_noise_data;
         u8 start_calib;
         __le16 sensitivity_tbl[HD_TABLE_SIZE];
 #endif /*CONFIG_IWL4965_SENSITIVITY*/
@@ -1171,7 +1169,7 @@ struct iwl_priv {
         u8 last_phy_res[100];
 
         /* Rate scaling data */
-        struct iwl_lq_mngr lq_mngr;
+        struct iwl4965_lq_mngr lq_mngr;
 
         /* Rate scaling data */
         s8 data_retry_limit;
@@ -1182,10 +1180,10 @@ struct iwl_priv {
         int activity_timer_active;
 
         /* Rx and Tx DMA processing queues */
-        struct iwl_rx_queue rxq;
-        struct iwl_tx_queue txq[IWL_MAX_NUM_QUEUES];
+        struct iwl4965_rx_queue rxq;
+        struct iwl4965_tx_queue txq[IWL_MAX_NUM_QUEUES];
         unsigned long txq_ctx_active_msk;
-        struct iwl_kw kw;       /* keep warm address */
+        struct iwl4965_kw kw;   /* keep warm address */
         u32 scd_base_addr;      /* scheduler sram base address */
 
         unsigned long status;
@@ -1194,9 +1192,9 @@ struct iwl_priv {
         int last_rx_rssi;       /* From Rx packet statisitics */
         int last_rx_noise;      /* From beacon statistics */
 
-        struct iwl_power_mgr power_data;
+        struct iwl4965_power_mgr power_data;
 
-        struct iwl_notif_statistics statistics;
+        struct iwl4965_notif_statistics statistics;
         unsigned long last_statistics_time;
 
         /* context information */
@@ -1213,7 +1211,7 @@ struct iwl_priv {
         /*station table variables */
         spinlock_t sta_lock;
         int num_stations;
-        struct iwl_station_entry stations[IWL_STATION_COUNT];
+        struct iwl4965_station_entry stations[IWL_STATION_COUNT];
 
         /* Indication if ieee80211_ops->open has been called */
         int is_open;
@@ -1234,7 +1232,7 @@ struct iwl_priv {
         struct list_head ibss_mac_hash[IWL_IBSS_MAC_HASH_SIZE];
 
         /* eeprom */
-        struct iwl_eeprom eeprom;
+        struct iwl4965_eeprom eeprom;
 
         int iw_mode;
 
@@ -1244,7 +1242,7 @@ struct iwl_priv {
         u32 timestamp0;
         u32 timestamp1;
         u16 beacon_int;
-        struct iwl_driver_hw_info hw_setting;
+        struct iwl4965_driver_hw_info hw_setting;
         int interface_id;
 
         /* Current association information needed to configure the
@@ -1254,7 +1252,7 @@ struct iwl_priv {
         u8 ps_mode;
 
 #ifdef CONFIG_IWL4965_QOS
-        struct iwl_qos_info qos_data;
+        struct iwl4965_qos_info qos_data;
 #endif /*CONFIG_IWL4965_QOS */
 
         struct workqueue_struct *workqueue;
@@ -1306,55 +1304,55 @@ struct iwl_priv {
 #ifdef CONFIG_IWL4965_HT_AGG
         struct work_struct agg_work;
 #endif
-};                              /*iwl_priv */
+};                              /*iwl4965_priv */
 
-static inline int iwl_is_associated(struct iwl_priv *priv)
+static inline int iwl4965_is_associated(struct iwl4965_priv *priv)
 {
         return (priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;
 }
 
-static inline int is_channel_valid(const struct iwl_channel_info *ch_info)
+static inline int is_channel_valid(const struct iwl4965_channel_info *ch_info)
 {
         if (ch_info == NULL)
                 return 0;
         return (ch_info->flags & EEPROM_CHANNEL_VALID) ? 1 : 0;
 }
 
-static inline int is_channel_narrow(const struct iwl_channel_info *ch_info)
+static inline int is_channel_narrow(const struct iwl4965_channel_info *ch_info)
 {
         return (ch_info->flags & EEPROM_CHANNEL_NARROW) ? 1 : 0;
 }
 
-static inline int is_channel_radar(const struct iwl_channel_info *ch_info)
+static inline int is_channel_radar(const struct iwl4965_channel_info *ch_info)
 {
         return (ch_info->flags & EEPROM_CHANNEL_RADAR) ? 1 : 0;
 }
 
-static inline u8 is_channel_a_band(const struct iwl_channel_info *ch_info)
+static inline u8 is_channel_a_band(const struct iwl4965_channel_info *ch_info)
 {
         return ch_info->phymode == MODE_IEEE80211A;
 }
 
-static inline u8 is_channel_bg_band(const struct iwl_channel_info *ch_info)
+static inline u8 is_channel_bg_band(const struct iwl4965_channel_info *ch_info)
 {
         return ((ch_info->phymode == MODE_IEEE80211B) ||
                 (ch_info->phymode == MODE_IEEE80211G));
 }
 
-static inline int is_channel_passive(const struct iwl_channel_info *ch)
+static inline int is_channel_passive(const struct iwl4965_channel_info *ch)
 {
         return (!(ch->flags & EEPROM_CHANNEL_ACTIVE)) ? 1 : 0;
 }
 
-static inline int is_channel_ibss(const struct iwl_channel_info *ch)
+static inline int is_channel_ibss(const struct iwl4965_channel_info *ch)
 {
         return ((ch->flags & EEPROM_CHANNEL_IBSS)) ? 1 : 0;
 }
 
-extern const struct iwl_channel_info *iwl_get_channel_info(
-        const struct iwl_priv *priv, int phymode, u16 channel);
+extern const struct iwl4965_channel_info *iwl4965_get_channel_info(
+        const struct iwl4965_priv *priv, int phymode, u16 channel);
 
-/* Requires full declaration of iwl_priv before including */
+/* Requires full declaration of iwl4965_priv before including */
 #include "iwl-4965-io.h"
 
-#endif                          /* __iwl_4965_h__ */
+#endif                          /* __iwl4965_4965_h__ */