1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index de2b18ee7f77..973c919fdd27 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -239,12 +239,11 @@ struct ath_buf {
         struct sk_buff *bf_mpdu;        /* enclosing frame structure */
         void *bf_desc;                  /* virtual addr of desc */
         dma_addr_t bf_daddr;            /* physical addr of desc */
-        dma_addr_t bf_buf_addr;         /* physical addr of data buffer */
+        dma_addr_t bf_buf_addr; /* physical addr of data buffer, for DMA */
         bool bf_stale;
         bool bf_tx_aborted;
         u16 bf_flags;
         struct ath_buf_state bf_state;
-        dma_addr_t bf_dmacontext;
         struct ath_wiphy *aphy;
 };
 
@@ -593,6 +592,8 @@ struct ath_softc {
         struct delayed_work wiphy_work;
         unsigned long wiphy_scheduler_int;
         int wiphy_scheduler_index;
+        struct survey_info *cur_survey;
+        struct survey_info survey[ATH9K_NUM_CHANNELS];
 
         struct tasklet_struct intr_tq;
         struct tasklet_struct bcon_tasklet;
@@ -621,8 +622,6 @@ struct ath_softc {
         struct ath_rx rx;
         struct ath_tx tx;
         struct ath_beacon beacon;
-        const struct ath_rate_table *cur_rate_table;
-        enum wireless_mode cur_rate_mode;
         struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
 
         struct ath_led radio_led;