1 files changed, 7 insertions, 28 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index b5ac32cfbeb8..44d74495c4de 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -30,7 +30,6 @@
 #include "spectral.h"
 
 struct ath_node;
-struct ath_rate_table;
 
 extern struct ieee80211_ops ath9k_ops;
 extern int ath9k_modparam_nohwcrypt;
@@ -150,6 +149,11 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
 #define IS_CCK_RATE(rate)  ((rate >= 0x18) && (rate <= 0x1e))
 #define IS_OFDM_RATE(rate) ((rate >= 0x8) && (rate <= 0xf))
 
+enum {
+       WLAN_RC_PHY_OFDM,
+       WLAN_RC_PHY_CCK,
+};
+
 struct ath_txq {
         int mac80211_qnum; /* mac80211 queue number, -1 means not mac80211 Q */
         u32 axq_qnum; /* ath9k hardware queue number */
@@ -399,21 +403,10 @@ void ath9k_calculate_iter_data(struct ieee80211_hw *hw,
 #define ATH_BCBUF                       8
 #define ATH_DEFAULT_BINTVAL             100 /* TU */
 #define ATH_DEFAULT_BMISS_LIMIT         10
-#define IEEE80211_MS_TO_TU(x)           (((x) * 1000) / 1024)
 
 #define TSF_TO_TU(_h,_l) \
         ((((u32)(_h)) << 22) | (((u32)(_l)) >> 10))
 
-struct ath_beacon_config {
-        int beacon_interval;
-        u16 listen_interval;
-        u16 dtim_period;
-        u16 bmiss_timeout;
-        u8 dtim_count;
-        bool enable_beacon;
-        bool ibss_creator;
-};
-
 struct ath_beacon {
         enum {
                 OK,             /* no change needed */
@@ -423,11 +416,9 @@ struct ath_beacon {
 
         u32 beaconq;
         u32 bmisscnt;
-        u32 bc_tstamp;
         struct ieee80211_vif *bslot[ATH_BCBUF];
         int slottime;
         int slotupdate;
-        struct ath9k_tx_queue_info beacon_qi;
         struct ath_descdma bdma;
         struct ath_txq *cabq;
         struct list_head bbuf;
@@ -442,7 +433,8 @@ void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif,
 void ath9k_beacon_assign_slot(struct ath_softc *sc, struct ieee80211_vif *vif);
 void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif);
 void ath9k_set_beacon(struct ath_softc *sc);
-bool ath9k_csa_is_finished(struct ath_softc *sc);
+bool ath9k_csa_is_finished(struct ath_softc *sc, struct ieee80211_vif *vif);
+void ath9k_csa_update(struct ath_softc *sc);
 
 /*******************/
 /* Link Monitoring */
@@ -693,15 +685,6 @@ void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs);
 #define ATH_TXPOWER_MAX         100     /* .5 dBm units */
 #define MAX_GTT_CNT             5
 
-enum sc_op_flags {
-        SC_OP_INVALID,
-        SC_OP_BEACONS,
-        SC_OP_ANI_RUN,
-        SC_OP_PRIM_STA_VIF,
-        SC_OP_HW_RESET,
-        SC_OP_SCANNING,
-};
-
 /* Powersave flags */
 #define PS_WAIT_FOR_BEACON        BIT(0)
 #define PS_WAIT_FOR_CAB           BIT(1)
@@ -731,7 +714,6 @@ struct ath_softc {
         struct completion paprd_complete;
         wait_queue_head_t tx_wait;
 
-        unsigned long sc_flags;
         unsigned long driver_data;
 
         u8 gtt_cnt;
@@ -748,7 +730,6 @@ struct ath_softc {
         struct ath_rx rx;
         struct ath_tx tx;
         struct ath_beacon beacon;
-        struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
 
 #ifdef CONFIG_MAC80211_LEDS
         bool led_registered;
@@ -757,7 +738,6 @@ struct ath_softc {
 #endif
 
         struct ath9k_hw_cal_data caldata;
-        int last_rssi;
 
 #ifdef CONFIG_ATH9K_DEBUGFS
         struct ath9k_debug debug;
@@ -774,7 +754,6 @@ struct ath_softc {
 #endif
 
         struct ath_descdma txsdma;
-        struct ieee80211_vif *csa_vif;
 
         struct ath_ant_comb ant_comb;
         u8 ant_tx, ant_rx;