lkml.org 
[lkml]   [2018]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 005/150] mac80211: Always report TX status
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ 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 9a6d7208bf4f..001a869c059c 100644
    --- a/net/mac80211/status.c
    +++ b/net/mac80211/status.c
    @@ -479,11 +479,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;
    @@ -506,6 +501,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


    \
     
     \ /
      Last update: 2018-11-02 20:10    [W:4.054 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site