iwlwifi: use iwl-commands.h also in 3945

[mv-sheeva.git] / drivers / net / wireless / iwlwifi / iwl-3945.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h
index 2c0ddc5110c6b1611e631239a8ef84a16c8e0539..00109324b33c761457696ce114b047c462853dd9 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-3945.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.h
@@ -250,7 +250,7 @@ struct iwl3945_clip_group {
 /* Power management (not Tx power) structures */
 
 struct iwl3945_power_vec_entry {
-       struct iwl3945_powertable_cmd cmd;
+       struct iwl_powertable_cmd cmd;
        u8 no_dtim;
 };
 #define IWL_POWER_RANGE_0  (0)
@@ -289,12 +289,6 @@ struct iwl3945_frame {
        struct list_head list;
 };
 
-#define SEQ_TO_QUEUE(x)  ((x >> 8) & 0xbf)
-#define QUEUE_TO_SEQ(x)  ((x & 0xbf) << 8)
-#define SEQ_TO_INDEX(x) ((u8)(x & 0xff))
-#define INDEX_TO_SEQ(x) ((u8)(x & 0xff))
-#define SEQ_HUGE_FRAME  (0x4000)
-#define SEQ_RX_FRAME    __constant_cpu_to_le16(0x8000)
 #define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)
 #define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)
 #define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)
@@ -344,7 +338,7 @@ struct iwl3945_cmd {
                u32 val32;
                struct iwl3945_bt_cmd bt;
                struct iwl3945_rxon_time_cmd rxon_time;
-               struct iwl3945_powertable_cmd powertable;
+               struct iwl_powertable_cmd powertable;
                struct iwl3945_qosparam_cmd qosparam;
                struct iwl3945_tx_cmd tx;
                struct iwl3945_tx_beacon_cmd tx_beacon;
@@ -481,13 +475,6 @@ struct iwl3945_qos_info {
 struct iwl3945_station_entry {
        struct iwl3945_addsta_cmd sta;
        struct iwl3945_tid_data tid[MAX_TID_COUNT];
-       union {
-               struct {
-                       u8 rate;
-                       u8 flags;
-               } s;
-               u16 rate_n_flags;
-       } current_rate;
        u8 used;
        u8 ps_status;
        struct iwl3945_hw_key keyinfo;
@@ -691,7 +678,6 @@ static inline void iwl3945_rfkill_unregister(struct iwl3945_priv *priv) {}
 static inline int iwl3945_rfkill_init(struct iwl3945_priv *priv) { return 0; }
 #endif
 
-#define IWL_MAX_NUM_QUEUES IWL39_MAX_NUM_QUEUES
 
 struct iwl3945_priv {
 
@@ -715,7 +701,7 @@ struct iwl3945_priv {
 
 #ifdef CONFIG_IWL3945_SPECTRUM_MEASUREMENT
        /* spectrum measurement report caching */
-       struct iwl3945_spectrum_notification measure_report;
+       struct iwl_spectrum_notification measure_report;
        u8 measurement_status;
 #endif
        /* ucode beacon time */
@@ -815,7 +801,7 @@ struct iwl3945_priv {
 
        /* Rx and Tx DMA processing queues */
        struct iwl3945_rx_queue rxq;
-       struct iwl3945_tx_queue txq[IWL_MAX_NUM_QUEUES];
+       struct iwl3945_tx_queue txq[IWL39_MAX_NUM_QUEUES];
 
        unsigned long status;