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, 100 insertions, 100 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-commands.h b/drivers/net/wireless/iwlwifi/iwl-4965-commands.h
index 5524bf77e88..2703c52750b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-commands.h
@@ -61,8 +61,8 @@
  *
  *****************************************************************************/
 
-#ifndef __iwl_commands_h__
-#define __iwl_commands_h__
+#ifndef __iwl4965_commands_h__
+#define __iwl4965_commands_h__
 
 enum {
         REPLY_ALIVE = 0x1,
@@ -147,7 +147,7 @@ enum {
 
 #define IWL_CMD_FAILED_MSK 0x40
 
-struct iwl_cmd_header {
+struct iwl4965_cmd_header {
         u8 cmd;
         u8 flags;
         /* We have 15 LSB to use as we please (MSB indicates
@@ -179,7 +179,7 @@ struct iwl_cmd_header {
 /*
  * REPLY_ALIVE = 0x1 (response only, not a command)
  */
-struct iwl_alive_resp {
+struct iwl4965_alive_resp {
         u8 ucode_minor;
         u8 ucode_major;
         __le16 reserved1;
@@ -193,7 +193,7 @@ struct iwl_alive_resp {
         __le32 is_valid;
 } __attribute__ ((packed));
 
-struct iwl_init_alive_resp {
+struct iwl4965_init_alive_resp {
         u8 ucode_minor;
         u8 ucode_major;
         __le16 reserved1;
@@ -225,7 +225,7 @@ union tsf {
 /*
  * REPLY_ERROR = 0x2 (response only, not a command)
  */
-struct iwl_error_resp {
+struct iwl4965_error_resp {
         __le32 error_type;
         u8 cmd_id;
         u8 reserved1;
@@ -293,7 +293,7 @@ enum {
 /*
  * REPLY_RXON = 0x10 (command, has simple generic response)
  */
-struct iwl_rxon_cmd {
+struct iwl4965_rxon_cmd {
         u8 node_addr[6];
         __le16 reserved1;
         u8 bssid_addr[6];
@@ -316,7 +316,7 @@ struct iwl_rxon_cmd {
 /*
  * REPLY_RXON_ASSOC = 0x11 (command, has simple generic response)
  */
-struct iwl_rxon_assoc_cmd {
+struct iwl4965_rxon_assoc_cmd {
         __le32 flags;
         __le32 filter_flags;
         u8 ofdm_basic_rates;
@@ -330,7 +330,7 @@ struct iwl_rxon_assoc_cmd {
 /*
  * REPLY_RXON_TIMING = 0x14 (command, has simple generic response)
  */
-struct iwl_rxon_time_cmd {
+struct iwl4965_rxon_time_cmd {
         union tsf timestamp;
         __le16 beacon_interval;
         __le16 atim_window;
@@ -339,7 +339,7 @@ struct iwl_rxon_time_cmd {
         __le16 reserved;
 } __attribute__ ((packed));
 
-struct iwl_tx_power {
+struct iwl4965_tx_power {
         u8 tx_gain;             /* gain for analog radio */
         u8 dsp_atten;           /* gain for DSP */
 } __attribute__ ((packed));
@@ -351,27 +351,27 @@ struct tx_power_dual_stream {
         __le32 dw;
 } __attribute__ ((packed));
 
-struct iwl_tx_power_db {
+struct iwl4965_tx_power_db {
         struct tx_power_dual_stream power_tbl[POWER_TABLE_NUM_ENTRIES];
 } __attribute__ ((packed));
 
 /*
  * REPLY_CHANNEL_SWITCH = 0x72 (command, has simple generic response)
  */
-struct iwl_channel_switch_cmd {
+struct iwl4965_channel_switch_cmd {
         u8 band;
         u8 expect_beacon;
         __le16 channel;
         __le32 rxon_flags;
         __le32 rxon_filter_flags;
         __le32 switch_time;
-        struct iwl_tx_power_db tx_power;
+        struct iwl4965_tx_power_db tx_power;
 } __attribute__ ((packed));
 
 /*
  * CHANNEL_SWITCH_NOTIFICATION = 0x73 (notification only, not a command)
  */
-struct iwl_csa_notification {
+struct iwl4965_csa_notification {
         __le16 band;
         __le16 channel;
         __le32 status;          /* 0 - OK, 1 - fail */
@@ -382,7 +382,7 @@ struct iwl_csa_notification {
  * Quality-of-Service (QOS) Commands & Responses:
  *
  *****************************************************************************/
-struct iwl_ac_qos {
+struct iwl4965_ac_qos {
         __le16 cw_min;
         __le16 cw_max;
         u8 aifsn;
@@ -404,9 +404,9 @@ struct iwl_ac_qos {
 /*
  * REPLY_QOS_PARAM = 0x13 (command, has simple generic response)
  */
-struct iwl_qosparam_cmd {
+struct iwl4965_qosparam_cmd {
         __le32 qos_flags;
-        struct iwl_ac_qos ac[AC_NUM];
+        struct iwl4965_ac_qos ac[AC_NUM];
 } __attribute__ ((packed));
 
 /******************************************************************************
@@ -464,7 +464,7 @@ struct iwl_qosparam_cmd {
 #define RATE_MCS_ANT_B_MSK      0x8000
 #define RATE_MCS_ANT_AB_MSK     0xc000
 
-struct iwl_keyinfo {
+struct iwl4965_keyinfo {
         __le16 key_flags;
         u8 tkip_rx_tsc_byte2;   /* TSC[2] for key mix ph1 detection */
         u8 reserved1;
@@ -484,11 +484,11 @@ struct sta_id_modify {
 /*
  * REPLY_ADD_STA = 0x18 (command)
  */
-struct iwl_addsta_cmd {
+struct iwl4965_addsta_cmd {
         u8 mode;
         u8 reserved[3];
         struct sta_id_modify sta;
-        struct iwl_keyinfo key;
+        struct iwl4965_keyinfo key;
         __le32 station_flags;
         __le32 station_flags_msk;
         __le16 tid_disable_tx;
@@ -502,7 +502,7 @@ struct iwl_addsta_cmd {
 /*
  * REPLY_ADD_STA = 0x18 (response)
  */
-struct iwl_add_sta_resp {
+struct iwl4965_add_sta_resp {
         u8 status;
 } __attribute__ ((packed));
 
@@ -514,7 +514,7 @@ struct iwl_add_sta_resp {
  *
  *****************************************************************************/
 
-struct iwl_rx_frame_stats {
+struct iwl4965_rx_frame_stats {
         u8 phy_count;
         u8 id;
         u8 rssi;
@@ -524,7 +524,7 @@ struct iwl_rx_frame_stats {
         u8 payload[0];
 } __attribute__ ((packed));
 
-struct iwl_rx_frame_hdr {
+struct iwl4965_rx_frame_hdr {
         __le16 channel;
         __le16 phy_flags;
         u8 reserved1;
@@ -554,7 +554,7 @@ struct iwl_rx_frame_hdr {
 #define RX_RES_STATUS_BAD_ICV_MIC       (0x1 << 11)
 #define RX_RES_STATUS_BAD_KEY_TTAK      (0x2 << 11)
 
-struct iwl_rx_frame_end {
+struct iwl4965_rx_frame_end {
         __le32 status;
         __le64 timestamp;
         __le32 beacon_timestamp;
@@ -568,10 +568,10 @@ struct iwl_rx_frame_end {
  * The actual offsets of the hdr and end are dynamic based on
  * stats.phy_count
  */
-struct iwl_rx_frame {
-        struct iwl_rx_frame_stats stats;
-        struct iwl_rx_frame_hdr hdr;
-        struct iwl_rx_frame_end end;
+struct iwl4965_rx_frame {
+        struct iwl4965_rx_frame_stats stats;
+        struct iwl4965_rx_frame_hdr hdr;
+        struct iwl4965_rx_frame_end end;
 } __attribute__ ((packed));
 
 /* Fixed (non-configurable) rx data from phy */
@@ -666,7 +666,7 @@ struct iwl4965_rx_mpdu_res_start {
  * TX command Frame life time
  */
 
-struct iwl_dram_scratch {
+struct iwl4965_dram_scratch {
         u8 try_cnt;
         u8 bt_kill_cnt;
         __le16 reserved;
@@ -675,11 +675,11 @@ struct iwl_dram_scratch {
 /*
  * REPLY_TX = 0x1c (command)
  */
-struct iwl_tx_cmd {
+struct iwl4965_tx_cmd {
         __le16 len;
         __le16 next_frame_len;
         __le32 tx_flags;
-        struct iwl_dram_scratch scratch;
+        struct iwl4965_dram_scratch scratch;
         __le32 rate_n_flags;
         u8 sta_id;
         u8 sec_ctl;
@@ -807,7 +807,7 @@ enum {
 /*
  * REPLY_TX = 0x1c (response)
  */
-struct iwl_tx_resp {
+struct iwl4965_tx_resp {
         u8 frame_count;         /* 1 no aggregation, >1 aggregation */
         u8 bt_kill_count;
         u8 failure_rts;
@@ -823,7 +823,7 @@ struct iwl_tx_resp {
 /*
  * REPLY_COMPRESSED_BA = 0xc5 (response only, not a command)
  */
-struct iwl_compressed_ba_resp {
+struct iwl4965_compressed_ba_resp {
         __le32 sta_addr_lo32;
         __le16 sta_addr_hi16;
         __le16 reserved;
@@ -839,11 +839,11 @@ struct iwl_compressed_ba_resp {
 /*
  * REPLY_TX_PWR_TABLE_CMD = 0x97 (command, has simple generic response)
  */
-struct iwl_txpowertable_cmd {
+struct iwl4965_txpowertable_cmd {
         u8 band;                /* 0: 5 GHz, 1: 2.4 GHz */
         u8 reserved;
         __le16 channel;
-        struct iwl_tx_power_db tx_power;
+        struct iwl4965_tx_power_db tx_power;
 } __attribute__ ((packed));
 
 /*RS_NEW_API: only TLC_RTS remains and moved to bit 0 */
@@ -856,7 +856,7 @@ struct iwl_txpowertable_cmd {
 #define  LINK_QUAL_ANT_B_MSK (1<<1)
 #define  LINK_QUAL_ANT_MSK   (LINK_QUAL_ANT_A_MSK|LINK_QUAL_ANT_B_MSK)
 
-struct iwl_link_qual_general_params {
+struct iwl4965_link_qual_general_params {
         u8 flags;
         u8 mimo_delimiter;
         u8 single_stream_ant_msk;
@@ -864,7 +864,7 @@ struct iwl_link_qual_general_params {
         u8 start_rate_index[LINK_QUAL_AC_NUM];
 } __attribute__ ((packed));
 
-struct iwl_link_qual_agg_params {
+struct iwl4965_link_qual_agg_params {
         __le16 agg_time_limit;
         u8 agg_dis_start_th;
         u8 agg_frame_cnt_limit;
@@ -874,12 +874,12 @@ struct iwl_link_qual_agg_params {
 /*
  * REPLY_TX_LINK_QUALITY_CMD = 0x4e (command, has simple generic response)
  */
-struct iwl_link_quality_cmd {
+struct iwl4965_link_quality_cmd {
         u8 sta_id;
         u8 reserved1;
         __le16 control;
-        struct iwl_link_qual_general_params general_params;
-        struct iwl_link_qual_agg_params agg_params;
+        struct iwl4965_link_qual_general_params general_params;
+        struct iwl4965_link_qual_agg_params agg_params;
         struct {
                 __le32 rate_n_flags;
         } rs_table[LINK_QUAL_MAX_RETRY_NUM];
@@ -889,7 +889,7 @@ struct iwl_link_quality_cmd {
 /*
  * REPLY_BT_CONFIG = 0x9b (command, has simple generic response)
  */
-struct iwl_bt_cmd {
+struct iwl4965_bt_cmd {
         u8 flags;
         u8 lead_time;
         u8 max_kill;
@@ -915,18 +915,18 @@ struct iwl_bt_cmd {
                                  RXON_FILTER_ASSOC_MSK           | \
                                  RXON_FILTER_BCON_AWARE_MSK)
 
-struct iwl_measure_channel {
+struct iwl4965_measure_channel {
         __le32 duration;        /* measurement duration in extended beacon
                                  * format */
         u8 channel;             /* channel to measure */
-        u8 type;                /* see enum iwl_measure_type */
+        u8 type;                /* see enum iwl4965_measure_type */
         __le16 reserved;
 } __attribute__ ((packed));
 
 /*
  * REPLY_SPECTRUM_MEASUREMENT_CMD = 0x74 (command)
  */
-struct iwl_spectrum_cmd {
+struct iwl4965_spectrum_cmd {
         __le16 len;             /* number of bytes starting from token */
         u8 token;               /* token id */
         u8 id;                  /* measurement id -- 0 or 1 */
@@ -939,13 +939,13 @@ struct iwl_spectrum_cmd {
         __le32 filter_flags;    /* rxon filter flags */
         __le16 channel_count;   /* minimum 1, maximum 10 */
         __le16 reserved3;
-        struct iwl_measure_channel channels[10];
+        struct iwl4965_measure_channel channels[10];
 } __attribute__ ((packed));
 
 /*
  * REPLY_SPECTRUM_MEASUREMENT_CMD = 0x74 (response)
  */
-struct iwl_spectrum_resp {
+struct iwl4965_spectrum_resp {
         u8 token;
         u8 id;                  /* id of the prior command replaced, or 0xff */
         __le16 status;          /* 0 - command will be handled
@@ -953,12 +953,12 @@ struct iwl_spectrum_resp {
                                  *     measurement) */
 } __attribute__ ((packed));
 
-enum iwl_measurement_state {
+enum iwl4965_measurement_state {
         IWL_MEASUREMENT_START = 0,
         IWL_MEASUREMENT_STOP = 1,
 };
 
-enum iwl_measurement_status {
+enum iwl4965_measurement_status {
         IWL_MEASUREMENT_OK = 0,
         IWL_MEASUREMENT_CONCURRENT = 1,
         IWL_MEASUREMENT_CSA_CONFLICT = 2,
@@ -971,18 +971,18 @@ enum iwl_measurement_status {
 
 #define NUM_ELEMENTS_IN_HISTOGRAM 8
 
-struct iwl_measurement_histogram {
+struct iwl4965_measurement_histogram {
         __le32 ofdm[NUM_ELEMENTS_IN_HISTOGRAM]; /* in 0.8usec counts */
         __le32 cck[NUM_ELEMENTS_IN_HISTOGRAM];  /* in 1usec counts */
 } __attribute__ ((packed));
 
 /* clear channel availability counters */
-struct iwl_measurement_cca_counters {
+struct iwl4965_measurement_cca_counters {
         __le32 ofdm;
         __le32 cck;
 } __attribute__ ((packed));
 
-enum iwl_measure_type {
+enum iwl4965_measure_type {
         IWL_MEASURE_BASIC = (1 << 0),
         IWL_MEASURE_CHANNEL_LOAD = (1 << 1),
         IWL_MEASURE_HISTOGRAM_RPI = (1 << 2),
@@ -995,7 +995,7 @@ enum iwl_measure_type {
 /*
  * SPECTRUM_MEASURE_NOTIFICATION = 0x75 (notification only, not a command)
  */
-struct iwl_spectrum_notification {
+struct iwl4965_spectrum_notification {
         u8 id;                  /* measurement id -- 0 or 1 */
         u8 token;
         u8 channel_index;       /* index in measurement channel list */
@@ -1003,7 +1003,7 @@ struct iwl_spectrum_notification {
         __le32 start_time;      /* lower 32-bits of TSF */
         u8 band;                /* 0 - 5.2GHz, 1 - 2.4GHz */
         u8 channel;
-        u8 type;                /* see enum iwl_measurement_type */
+        u8 type;                /* see enum iwl4965_measurement_type */
         u8 reserved1;
         /* NOTE:  cca_ofdm, cca_cck, basic_type, and histogram are only only
          * valid if applicable for measurement type requested. */
@@ -1013,9 +1013,9 @@ struct iwl_spectrum_notification {
         u8 basic_type;          /* 0 - bss, 1 - ofdm preamble, 2 -
                                  * unidentified */
         u8 reserved2[3];
-        struct iwl_measurement_histogram histogram;
+        struct iwl4965_measurement_histogram histogram;
         __le32 stop_time;       /* lower 32-bits of TSF */
-        __le32 status;          /* see iwl_measurement_status */
+        __le32 status;          /* see iwl4965_measurement_status */
 } __attribute__ ((packed));
 
 /******************************************************************************
@@ -1025,7 +1025,7 @@ struct iwl_spectrum_notification {
  *****************************************************************************/
 
 /**
- * struct iwl_powertable_cmd - Power Table Command
+ * struct iwl4965_powertable_cmd - Power Table Command
  * @flags: See below:
  *
  * POWER_TABLE_CMD = 0x77 (command, has simple generic response)
@@ -1058,7 +1058,7 @@ struct iwl_spectrum_notification {
 #define IWL_POWER_SLEEP_OVER_DTIM_MSK           __constant_cpu_to_le16(1<<2)
 #define IWL_POWER_PCI_PM_MSK                    __constant_cpu_to_le16(1<<3)
 
-struct iwl_powertable_cmd {
+struct iwl4965_powertable_cmd {
         __le16 flags;
         u8 keep_alive_seconds;
         u8 debug_flags;
@@ -1072,7 +1072,7 @@ struct iwl_powertable_cmd {
  * PM_SLEEP_NOTIFICATION = 0x7A (notification only, not a command)
  * 3945 and 4965 identical.
  */
-struct iwl_sleep_notification {
+struct iwl4965_sleep_notification {
         u8 pm_sleep_mode;
         u8 pm_wakeup_src;
         __le16 reserved;
@@ -1102,14 +1102,14 @@ enum {
 #define CARD_STATE_CMD_DISABLE 0x00     /* Put card to sleep */
 #define CARD_STATE_CMD_ENABLE  0x01     /* Wake up card */
 #define CARD_STATE_CMD_HALT    0x02     /* Power down permanently */
-struct iwl_card_state_cmd {
+struct iwl4965_card_state_cmd {
         __le32 status;          /* CARD_STATE_CMD_* request new power state */
 } __attribute__ ((packed));
 
 /*
  * CARD_STATE_NOTIFICATION = 0xa1 (notification only, not a command)
  */
-struct iwl_card_state_notif {
+struct iwl4965_card_state_notif {
         __le32 flags;
 } __attribute__ ((packed));
 
@@ -1118,7 +1118,7 @@ struct iwl_card_state_notif {
 #define RF_CARD_DISABLED   0x04
 #define RXON_CARD_DISABLED 0x10
 
-struct iwl_ct_kill_config {
+struct iwl4965_ct_kill_config {
         __le32   reserved;
         __le32   critical_temperature_M;
         __le32   critical_temperature_R;
@@ -1130,7 +1130,7 @@ struct iwl_ct_kill_config {
  *
  *****************************************************************************/
 
-struct iwl_scan_channel {
+struct iwl4965_scan_channel {
         /* type is defined as:
          * 0:0 active (0 - passive)
          * 1:4 SSID direct
@@ -1139,12 +1139,12 @@ struct iwl_scan_channel {
          */
         u8 type;
         u8 channel;
-        struct iwl_tx_power tpc;
+        struct iwl4965_tx_power tpc;
         __le16 active_dwell;
         __le16 passive_dwell;
 } __attribute__ ((packed));
 
-struct iwl_ssid_ie {
+struct iwl4965_ssid_ie {
         u8 id;
         u8 len;
         u8 ssid[32];
@@ -1158,7 +1158,7 @@ struct iwl_ssid_ie {
 /*
  * REPLY_SCAN_CMD = 0x80 (command)
  */
-struct iwl_scan_cmd {
+struct iwl4965_scan_cmd {
         __le16 len;
         u8 reserved0;
         u8 channel_count;
@@ -1177,14 +1177,14 @@ struct iwl_scan_cmd {
         __le32 flags;
         __le32 filter_flags;
 
-        struct iwl_tx_cmd tx_cmd;
-        struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];
+        struct iwl4965_tx_cmd tx_cmd;
+        struct iwl4965_ssid_ie direct_scan[PROBE_OPTION_MAX];
 
         u8 data[0];
         /*
          * The channels start after the probe request payload and are of type:
          *
-         * struct iwl_scan_channel channels[0];
+         * struct iwl4965_scan_channel channels[0];
          *
          * NOTE:  Only one band of channels can be scanned per pass.  You
          * can not mix 2.4GHz channels and 5.2GHz channels and must
@@ -1201,14 +1201,14 @@ struct iwl_scan_cmd {
 /*
  * REPLY_SCAN_CMD = 0x80 (response)
  */
-struct iwl_scanreq_notification {
+struct iwl4965_scanreq_notification {
         __le32 status;          /* 1: okay, 2: cannot fulfill request */
 } __attribute__ ((packed));
 
 /*
  * SCAN_START_NOTIFICATION = 0x82 (notification only, not a command)
  */
-struct iwl_scanstart_notification {
+struct iwl4965_scanstart_notification {
         __le32 tsf_low;
         __le32 tsf_high;
         __le32 beacon_timer;
@@ -1225,7 +1225,7 @@ struct iwl_scanstart_notification {
 /*
  * SCAN_RESULTS_NOTIFICATION = 0x83 (notification only, not a command)
  */
-struct iwl_scanresults_notification {
+struct iwl4965_scanresults_notification {
         u8 channel;
         u8 band;
         u8 reserved[2];
@@ -1237,7 +1237,7 @@ struct iwl_scanresults_notification {
 /*
  * SCAN_COMPLETE_NOTIFICATION = 0x84 (notification only, not a command)
  */
-struct iwl_scancomplete_notification {
+struct iwl4965_scancomplete_notification {
         u8 scanned_channels;
         u8 status;
         u8 reserved;
@@ -1256,8 +1256,8 @@ struct iwl_scancomplete_notification {
 /*
  * BEACON_NOTIFICATION = 0x90 (notification only, not a command)
  */
-struct iwl_beacon_notif {
-        struct iwl_tx_resp beacon_notify_hdr;
+struct iwl4965_beacon_notif {
+        struct iwl4965_tx_resp beacon_notify_hdr;
         __le32 low_tsf;
         __le32 high_tsf;
         __le32 ibss_mgr_status;
@@ -1266,8 +1266,8 @@ struct iwl_beacon_notif {
 /*
  * REPLY_TX_BEACON = 0x91 (command, has simple generic response)
  */
-struct iwl_tx_beacon_cmd {
-        struct iwl_tx_cmd tx;
+struct iwl4965_tx_beacon_cmd {
+        struct iwl4965_tx_cmd tx;
         __le16 tim_idx;
         u8 tim_size;
         u8 reserved1;
@@ -1458,7 +1458,7 @@ struct statistics_general {
  */
 #define IWL_STATS_CONF_CLEAR_STATS __constant_cpu_to_le32(0x1)  /* see above */
 #define IWL_STATS_CONF_DISABLE_NOTIF __constant_cpu_to_le32(0x2)/* see above */
-struct iwl_statistics_cmd {
+struct iwl4965_statistics_cmd {
         __le32 configuration_flags;     /* IWL_STATS_CONF_* */
 } __attribute__ ((packed));
 
@@ -1479,7 +1479,7 @@ struct iwl_statistics_cmd {
  */
 #define STATISTICS_REPLY_FLG_BAND_24G_MSK         __constant_cpu_to_le32(0x2)
 #define STATISTICS_REPLY_FLG_FAT_MODE_MSK         __constant_cpu_to_le32(0x8)
-struct iwl_notif_statistics {
+struct iwl4965_notif_statistics {
         __le32 flag;
         struct statistics_rx rx;
         struct statistics_tx tx;
@@ -1494,7 +1494,7 @@ struct iwl_notif_statistics {
  * then this notification will be sent. */
 #define CONSECUTIVE_MISSED_BCONS_TH 20
 
-struct iwl_missed_beacon_notif {
+struct iwl4965_missed_beacon_notif {
         __le32 consequtive_missed_beacons;
         __le32 total_missed_becons;
         __le32 num_expected_beacons;
@@ -1510,12 +1510,12 @@ struct iwl_missed_beacon_notif {
 #define PHY_CALIBRATE_DIFF_GAIN_CMD (7)
 #define HD_TABLE_SIZE  (11)
 
-struct iwl_sensitivity_cmd {
+struct iwl4965_sensitivity_cmd {
         __le16 control;
         __le16 table[HD_TABLE_SIZE];
 } __attribute__ ((packed));
 
-struct iwl_calibration_cmd {
+struct iwl4965_calibration_cmd {
         u8 opCode;
         u8 flags;
         __le16 reserved;
@@ -1538,7 +1538,7 @@ struct iwl_calibration_cmd {
  * For each of 3 possible LEDs (Activity/Link/Tech, selected by "id" field),
  * this command turns it on or off, or sets up a periodic blinking cycle.
  */
-struct iwl_led_cmd {
+struct iwl4965_led_cmd {
         __le32 interval;        /* "interval" in uSec */
         u8 id;                  /* 1: Activity, 2: Link, 3: Tech */
         u8 off;                 /* # intervals off while blinking;
@@ -1554,29 +1554,29 @@ struct iwl_led_cmd {
  *
  *****************************************************************************/
 
-struct iwl_rx_packet {
+struct iwl4965_rx_packet {
         __le32 len;
-        struct iwl_cmd_header hdr;
+        struct iwl4965_cmd_header hdr;
         union {
-                struct iwl_alive_resp alive_frame;
-                struct iwl_rx_frame rx_frame;
-                struct iwl_tx_resp tx_resp;
-                struct iwl_spectrum_notification spectrum_notif;
-                struct iwl_csa_notification csa_notif;
-                struct iwl_error_resp err_resp;
-                struct iwl_card_state_notif card_state_notif;
-                struct iwl_beacon_notif beacon_status;
-                struct iwl_add_sta_resp add_sta;
-                struct iwl_sleep_notification sleep_notif;
-                struct iwl_spectrum_resp spectrum;
-                struct iwl_notif_statistics stats;
-                struct iwl_compressed_ba_resp compressed_ba;
-                struct iwl_missed_beacon_notif missed_beacon;
+                struct iwl4965_alive_resp alive_frame;
+                struct iwl4965_rx_frame rx_frame;
+                struct iwl4965_tx_resp tx_resp;
+                struct iwl4965_spectrum_notification spectrum_notif;
+                struct iwl4965_csa_notification csa_notif;
+                struct iwl4965_error_resp err_resp;
+                struct iwl4965_card_state_notif card_state_notif;
+                struct iwl4965_beacon_notif beacon_status;
+                struct iwl4965_add_sta_resp add_sta;
+                struct iwl4965_sleep_notification sleep_notif;
+                struct iwl4965_spectrum_resp spectrum;
+                struct iwl4965_notif_statistics stats;
+                struct iwl4965_compressed_ba_resp compressed_ba;
+                struct iwl4965_missed_beacon_notif missed_beacon;
                 __le32 status;
                 u8 raw[0];
         } u;
 } __attribute__ ((packed));
 
-#define IWL_RX_FRAME_SIZE        (4 + sizeof(struct iwl_rx_frame))
+#define IWL_RX_FRAME_SIZE        (4 + sizeof(struct iwl4965_rx_frame))
 
-#endif                          /* __iwl_commands_h__ */
+#endif                          /* __iwl4965_commands_h__ */