OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4f92be3
)
staging: vt6656: Fix false Tx excessive retries reporting.
author
Malcolm Priestley
<tvboxspy@gmail.com>
Wed, 8 Jan 2020 21:41:36 +0000
(21:41 +0000)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 5 Feb 2020 13:03:33 +0000
(13:03 +0000)
commit
9dd631fa99dc0a0dfbd191173bf355ba30ea786a
upstream.
The driver reporting IEEE80211_TX_STAT_ACK is not being handled
correctly. The driver should only report on TSR_TMO flag is not
set indicating no transmission errors and when not IEEE80211_TX_CTL_NO_ACK
is being requested.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Link:
https://lore.kernel.org/r/340f1f7f-c310-dca5-476f-abc059b9cd97@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/int.c
patch
|
blob
|
history
diff --git
a/drivers/staging/vt6656/int.c
b/drivers/staging/vt6656/int.c
index
14b8ebc
..
cb22b5e
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);