1 files changed, 13 insertions, 11 deletions

diff --git a/drivers/net/wireless/ath/ar9170/ar9170.h b/drivers/net/wireless/ath/ar9170/ar9170.h
index 914e4718a9a8..dc662b76a1c8 100644
--- a/drivers/net/wireless/ath/ar9170/ar9170.h
+++ b/drivers/net/wireless/ath/ar9170/ar9170.h
@@ -109,7 +109,6 @@ struct ar9170_rxstream_mpdu_merge {
         bool has_plcp;
 };
 
-#define AR9170_NUM_MAX_BA_RETRY 5
 #define AR9170_NUM_TID  16
 #define WME_BA_BMP_SIZE         64
 #define AR9170_NUM_MAX_AGG_LEN  (2 * WME_BA_BMP_SIZE)
@@ -143,7 +142,12 @@ struct ar9170_sta_tid {
         u16 tid;
         enum ar9170_tid_state state;
         bool active;
-        u8 retry;
+};
+
+struct ar9170_tx_queue_stats {
+        unsigned int len;
+        unsigned int limit;
+        unsigned int count;
 };
 
 #define AR9170_QUEUE_TIMEOUT            64
@@ -154,12 +158,15 @@ struct ar9170_sta_tid {
 
 #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)
 
 struct ar9170 {
         struct ieee80211_hw *hw;
         struct ath_common common;
         struct mutex mutex;
         enum ar9170_device_state state;
+        bool registered;
         unsigned long bad_hw_nagger;
 
         int (*open)(struct ar9170 *);
@@ -172,8 +179,6 @@ struct ar9170 {
 
         /* interface mode settings */
         struct ieee80211_vif *vif;
-        u8 mac_addr[ETH_ALEN];
-        u8 bssid[ETH_ALEN];
 
         /* beaconing */
         struct sk_buff *beacon;
@@ -204,6 +209,8 @@ struct ar9170 {
         u8 power_2G_ht20[8];
         u8 power_2G_ht40[8];
 
+        u8 phy_heavy_clip;
+
 #ifdef CONFIG_AR9170_LEDS
         struct delayed_work led_work;
         struct ar9170_led leds[AR9170_NUM_LEDS];
@@ -211,7 +218,7 @@ struct ar9170 {
 
         /* qos queue settings */
         spinlock_t tx_stats_lock;
-        struct ieee80211_tx_queue_stats tx_stats[5];
+        struct ar9170_tx_queue_stats tx_stats[5];
         struct ieee80211_tx_queue_params edcf[5];
 
         spinlock_t cmdlock;
@@ -231,7 +238,7 @@ struct ar9170 {
         struct sk_buff_head tx_status_ampdu;
         spinlock_t tx_ampdu_list_lock;
         struct list_head tx_ampdu_list;
-        unsigned int tx_ampdu_pending;
+        atomic_t tx_ampdu_pending;
 
         /* rxstream mpdu merge */
         struct ar9170_rxstream_mpdu_merge rx_mpdu;
@@ -248,13 +255,8 @@ struct ar9170_sta_info {
         unsigned int ampdu_max_len;
 };
 
-#define AR9170_TX_FLAG_WAIT_FOR_ACK     BIT(0)
-#define AR9170_TX_FLAG_NO_ACK           BIT(1)
-#define AR9170_TX_FLAG_BLOCK_ACK        BIT(2)
-
 struct ar9170_tx_info {
         unsigned long timeout;
-        unsigned int flags;
 };
 
 #define IS_STARTED(a)           (((struct ar9170 *)a)->state >= AR9170_STARTED)