Merge tag 'v4.4.214' into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / staging / vt6656 / int.c

diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index f81a2e5..888a8ae 100644 (file)
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -111,9 +111,11 @@ static int vnt_int_report_rate(struct vnt_private *priv, u8 pkt_no, u8 tsr)
 
        info->status.rates[0].count = tx_retry;
 
-       if (!(tsr & (TSR_TMO | TSR_RETRYTMO))) {
+       if (!(tsr & TSR_TMO)) {
                info->status.rates[0].idx = idx;
-               info->flags |= IEEE80211_TX_STAT_ACK;
+
+               if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
+                       info->flags |= IEEE80211_TX_STAT_ACK;
        }
 
        ieee80211_tx_status_irqsafe(priv->hw, context->skb);