1 files changed, 7 insertions, 11 deletions

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 32acaf7ff622..a7656a3ea1b0 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -457,12 +457,13 @@ void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
         DPRINTF(sc, ATH_DBG_XMIT,
                 "%s: TX complete: skb: %p\n", __func__, skb);
 
+        ieee80211_tx_info_clear_status(tx_info);
         if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK ||
                 tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED) {
-                /* free driver's private data area of tx_info */
-                if (tx_info->driver_data[0] != NULL)
-                        kfree(tx_info->driver_data[0]);
-                        tx_info->driver_data[0] = NULL;
+                /* free driver's private data area of tx_info, XXX: HACK! */
+                if (tx_info->control.vif != NULL)
+                        kfree(tx_info->control.vif);
+                        tx_info->control.vif = NULL;
         }
 
         if (tx_status->flags & ATH_TX_BAR) {
@@ -470,17 +471,12 @@ void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
                 tx_status->flags &= ~ATH_TX_BAR;
         }
 
-        if (tx_status->flags & (ATH_TX_ERROR | ATH_TX_XRETRY)) {
-                if (!(tx_info->flags & IEEE80211_TX_CTL_NO_ACK)) {
-                        /* Frame was not ACKed, but an ACK was expected */
-                        tx_info->status.excessive_retries = 1;
-                }
-        } else {
+        if (!(tx_status->flags & (ATH_TX_ERROR | ATH_TX_XRETRY))) {
                 /* Frame was ACKed */
                 tx_info->flags |= IEEE80211_TX_STAT_ACK;
         }
 
-        tx_info->status.retry_count = tx_status->retries;
+        tx_info->status.rates[0].count = tx_status->retries + 1;
 
         ieee80211_tx_status(hw, skb);
         if (an)