| From 9012841fbe50f464a65b0108fdff19f77028dabf Mon Sep 17 00:00:00 2001 |
| From: Andrei Otcheretianski <andrei.otcheretianski@intel.com> |
| Date: Wed, 5 Sep 2018 08:06:13 +0300 |
| Subject: mac80211: Always report TX status |
| |
| [ Upstream commit 8682250b3c1b75a45feb7452bc413d004cfe3778 ] |
| |
| If a frame is dropped for any reason, mac80211 wouldn't report the TX |
| status back to user space. |
| |
| As the user space may rely on the TX_STATUS to kick its state |
| machines, resends etc, it's better to just report this frame as not |
| acked instead. |
| |
| Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| net/mac80211/status.c | 7 ++----- |
| 1 file changed, 2 insertions(+), 5 deletions(-) |
| |
| diff --git a/net/mac80211/status.c b/net/mac80211/status.c |
| index 72fe9bc7a1f9..7892bac21eac 100644 |
| --- a/net/mac80211/status.c |
| +++ b/net/mac80211/status.c |
| @@ -472,11 +472,6 @@ static void ieee80211_report_ack_skb(struct ieee80211_local *local, |
| if (!skb) |
| return; |
| |
| - if (dropped) { |
| - dev_kfree_skb_any(skb); |
| - return; |
| - } |
| - |
| if (info->flags & IEEE80211_TX_INTFL_NL80211_FRAME_TX) { |
| u64 cookie = IEEE80211_SKB_CB(skb)->ack.cookie; |
| struct ieee80211_sub_if_data *sdata; |
| @@ -497,6 +492,8 @@ static void ieee80211_report_ack_skb(struct ieee80211_local *local, |
| } |
| rcu_read_unlock(); |
| |
| + dev_kfree_skb_any(skb); |
| + } else if (dropped) { |
| dev_kfree_skb_any(skb); |
| } else { |
| /* consumes skb */ |
| -- |
| 2.17.1 |
| |
