Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)
  forcedeth: fix a few sparse warnings (variable shadowing)
  forcedeth: Improve stats counters
  forcedeth: remove unneeded stats updates
  forcedeth: Acknowledge only interrupts that are being processed
  forcedeth: fix race when unloading module
  MAINTAINERS/rds: update maintainer
  wanrouter: Remove kernel_lock annotations
  usbnet: fix oops in usbnet_start_xmit
  ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined
  etherh: Add MAINTAINERS entry for etherh
  bonding: comparing a u8 with -1 is always false
  sky2: fix regression on Yukon Optima
  netlink: clarify attribute length check documentation
  netlink: validate NLA_MSECS length
  i825xx:xscale:8390:freescale: Fix Kconfig dependancies
  macvlan: receive multicast with local address
  tg3: Update version to 3.121
  tg3: Eliminate timer race with reset_task
  tg3: Schedule at most one tg3_reset_task run
  tg3: Obtain PCI function number from device
  ...

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index d20946939cd8..59472e1605cd 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -296,7 +296,8 @@ static void carl9170_tx_release(struct kref *ref)
                         super = (void *)skb->data;
                         txinfo->status.ampdu_len = super->s.rix;
                         txinfo->status.ampdu_ack_len = super->s.cnt;
-                } else if (txinfo->flags & IEEE80211_TX_STAT_ACK) {
+                } else if ((txinfo->flags & IEEE80211_TX_STAT_ACK) &&
+                           !(txinfo->flags & IEEE80211_TX_CTL_REQ_TX_STATUS)) {
                         /*
                          * drop redundant tx_status reports:
                          *
@@ -308,15 +309,17 @@ static void carl9170_tx_release(struct kref *ref)
                          *
                          * 3. minstrel_ht is picky, it only accepts
                          *    reports of frames with the TX_STATUS_AMPDU flag.
+                         *
+                         * 4. mac80211 is not particularly interested in
+                         *    feedback either [CTL_REQ_TX_STATUS not set]
                          */
 
                         dev_kfree_skb_any(skb);
                         return;
                 } else {
                         /*
-                         * Frame has failed, but we want to keep it in
-                         * case it was lost due to a power-state
-                         * transition.
+                         * Either the frame transmission has failed or
+                         * mac80211 requested tx status.
                          */
                 }
         }