ath5k: remove most references to XR

[cascardo/linux.git] / drivers / net / wireless / ath / ath5k / ath5k.h

diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h
index 277d5cb..a8a7db4 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath/ath5k/ath5k.h
@@ -131,13 +131,6 @@
 #define AR5K_REG_DISABLE_BITS(ah, _reg, _flags)                        \
        ath5k_hw_reg_write(ah, ath5k_hw_reg_read(ah, _reg) & ~(_flags), _reg)
 
-/* Access to PHY registers */
-#define AR5K_PHY_READ(ah, _reg)                                        \
-       ath5k_hw_reg_read(ah, (ah)->ah_phy + ((_reg) << 2))
-
-#define AR5K_PHY_WRITE(ah, _reg, _val)                                 \
-       ath5k_hw_reg_write(ah, _val, (ah)->ah_phy + ((_reg) << 2))
-
 /* Access QCU registers per queue */
 #define AR5K_REG_READ_Q(ah, _reg, _queue)                              \
        (ath5k_hw_reg_read(ah, _reg) & (1 << _queue))                   \
@@ -166,7 +159,6 @@
 #define AR5K_TUNE_DMA_BEACON_RESP              2
 #define AR5K_TUNE_SW_BEACON_RESP               10
 #define AR5K_TUNE_ADDITIONAL_SWBA_BACKOFF      0
-#define AR5K_TUNE_RADAR_ALERT                  false
 #define AR5K_TUNE_MIN_TX_FIFO_THRES            1
 #define AR5K_TUNE_MAX_TX_FIFO_THRES    ((IEEE80211_MAX_FRAME_LEN / 64) + 1)
 #define AR5K_TUNE_REGISTER_TIMEOUT             20000
@@ -424,7 +416,6 @@ enum ath5k_driver_mode {
        AR5K_MODE_11A           =       0,
        AR5K_MODE_11B           =       1,
        AR5K_MODE_11G           =       2,
-       AR5K_MODE_XR            =       0,
        AR5K_MODE_MAX           =       3
 };
 
@@ -702,12 +693,10 @@ struct ath5k_gain {
 #define        CHANNEL_5GHZ    0x0100  /* 5GHz channel */
 #define        CHANNEL_PASSIVE 0x0200  /* Only passive scan allowed */
 #define        CHANNEL_DYN     0x0400  /* Dynamic CCK-OFDM channel (for g operation) */
-#define        CHANNEL_XR      0x0800  /* XR channel */
 
 #define        CHANNEL_A       (CHANNEL_5GHZ | CHANNEL_OFDM)
 #define        CHANNEL_B       (CHANNEL_2GHZ | CHANNEL_CCK)
 #define        CHANNEL_G       (CHANNEL_2GHZ | CHANNEL_OFDM)
-#define        CHANNEL_X       (CHANNEL_5GHZ | CHANNEL_OFDM | CHANNEL_XR)
 
 #define        CHANNEL_ALL     (CHANNEL_OFDM | CHANNEL_CCK | \
                         CHANNEL_2GHZ | CHANNEL_5GHZ)
@@ -718,7 +707,6 @@ struct ath5k_gain {
  * Used internally for ath5k_hw_reset_tx_queue().
  * Also see struct struct ieee80211_channel.
  */
-#define IS_CHAN_XR(_c) ((_c->hw_value & CHANNEL_XR) != 0)
 #define IS_CHAN_B(_c)  ((_c->hw_value & CHANNEL_B) != 0)
 
 /*
@@ -1013,16 +1001,6 @@ struct ath5k_nfcal_hist {
        s16 nfval[ATH5K_NF_CAL_HIST_MAX];       /* last few noise floors */
 };
 
-/**
- * struct avg_val - Helper structure for average calculation
- * @avg: contains the actual average value
- * @avg_weight: is used internally during calculation to prevent rounding errors
- */
-struct ath5k_avg_val {
-       int avg;
-       int avg_weight;
-};
-
 #define ATH5K_LED_MAX_NAME_LEN 31
 
 /*
@@ -1148,7 +1126,6 @@ struct ath5k_hw {
        bool                    rx_pending;     /* rx tasklet pending */
        bool                    tx_pending;     /* tx tasklet pending */
 
-       u8                      lladdr[ETH_ALEN];
        u8                      bssidmask[ETH_ALEN];
 
        unsigned int            led_pin,        /* GPIO pin for driving LED */
@@ -1156,7 +1133,6 @@ struct ath5k_hw {
 
        struct work_struct      reset_work;     /* deferred chip reset */
 
-       unsigned int            rxbufsize;      /* rx size based on mtu */
        struct list_head        rxbuf;          /* receive buffer */
        spinlock_t              rxbuflock;
        u32                     *rxlink;        /* link ptr in last RX desc */
@@ -1208,10 +1184,8 @@ struct ath5k_hw {
 
        enum ath5k_version      ah_version;
        enum ath5k_radio        ah_radio;
-       u32                     ah_phy;
        u32                     ah_mac_srev;
        u16                     ah_mac_version;
-       u16                     ah_mac_revision;
        u16                     ah_phy_revision;
        u16                     ah_radio_5ghz_revision;
        u16                     ah_radio_2ghz_revision;
@@ -1279,12 +1253,6 @@ struct ath5k_hw {
                bool            txp_setup;
        } ah_txpower;
 
-       struct {
-               bool            r_enabled;
-               int             r_last_alert;
-               struct ieee80211_channel r_last_channel;
-       } ah_radar;
-
        struct ath5k_nfcal_hist ah_nfcal_hist;
 
        /* average beacon RSSI in our BSS (used by ANI) */