1 files changed, 2 insertions, 50 deletions

diff --git a/drivers/net/wireless/ath/ar9170/ar9170.h b/drivers/net/wireless/ath/ar9170/ar9170.h
index dc662b76a1c8..4f845f80c098 100644
--- a/drivers/net/wireless/ath/ar9170/ar9170.h
+++ b/drivers/net/wireless/ath/ar9170/ar9170.h
@@ -109,41 +109,6 @@ struct ar9170_rxstream_mpdu_merge {
         bool has_plcp;
 };
 
-#define AR9170_NUM_TID  16
-#define WME_BA_BMP_SIZE         64
-#define AR9170_NUM_MAX_AGG_LEN  (2 * WME_BA_BMP_SIZE)
-
-#define WME_AC_BE   2
-#define WME_AC_BK   3
-#define WME_AC_VI   1
-#define WME_AC_VO   0
-
-#define TID_TO_WME_AC(_tid)                             \
-        ((((_tid) == 0) || ((_tid) == 3)) ? WME_AC_BE : \
-         (((_tid) == 1) || ((_tid) == 2)) ? WME_AC_BK : \
-         (((_tid) == 4) || ((_tid) == 5)) ? WME_AC_VI : \
-         WME_AC_VO)
-
-#define BAW_WITHIN(_start, _bawsz, _seqno) \
-        ((((_seqno) - (_start)) & 0xfff) < (_bawsz))
-
-enum ar9170_tid_state {
-        AR9170_TID_STATE_INVALID,
-        AR9170_TID_STATE_SHUTDOWN,
-        AR9170_TID_STATE_PROGRESS,
-        AR9170_TID_STATE_COMPLETE,
-};
-
-struct ar9170_sta_tid {
-        struct list_head list;
-        struct sk_buff_head queue;
-        u8 addr[ETH_ALEN];
-        u16 ssn;
-        u16 tid;
-        enum ar9170_tid_state state;
-        bool active;
-};
-
 struct ar9170_tx_queue_stats {
         unsigned int len;
         unsigned int limit;
@@ -152,14 +117,11 @@ struct ar9170_tx_queue_stats {
 
 #define AR9170_QUEUE_TIMEOUT            64
 #define AR9170_TX_TIMEOUT               8
-#define AR9170_BA_TIMEOUT               4
 #define AR9170_JANITOR_DELAY            128
 #define AR9170_TX_INVALID_RATE          0xffffffff
 
-#define AR9170_NUM_TX_STATUS            128
-#define AR9170_NUM_TX_AGG_MAX           30
-#define AR9170_NUM_TX_LIMIT_HARD       AR9170_TXQ_DEPTH
-#define AR9170_NUM_TX_LIMIT_SOFT       (AR9170_TXQ_DEPTH - 10)
+#define AR9170_NUM_TX_LIMIT_HARD        AR9170_TXQ_DEPTH
+#define AR9170_NUM_TX_LIMIT_SOFT        (AR9170_TXQ_DEPTH - 10)
 
 struct ar9170 {
         struct ieee80211_hw *hw;
@@ -234,11 +196,6 @@ struct ar9170 {
         struct sk_buff_head tx_pending[__AR9170_NUM_TXQ];
         struct sk_buff_head tx_status[__AR9170_NUM_TXQ];
         struct delayed_work tx_janitor;
-        /* tx ampdu */
-        struct sk_buff_head tx_status_ampdu;
-        spinlock_t tx_ampdu_list_lock;
-        struct list_head tx_ampdu_list;
-        atomic_t tx_ampdu_pending;
 
         /* rxstream mpdu merge */
         struct ar9170_rxstream_mpdu_merge rx_mpdu;
@@ -250,11 +207,6 @@ struct ar9170 {
         u8 global_ampdu_factor;
 };
 
-struct ar9170_sta_info {
-        struct ar9170_sta_tid agg[AR9170_NUM_TID];
-        unsigned int ampdu_max_len;
-};
-
 struct ar9170_tx_info {
         unsigned long timeout;
 };