mac80211: check and refresh aggregation session in encap offload tx

Update the last_tx timestamp to avoid tearing down the aggregation session
early. Fall back to the slow path if the session setup is still running

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20200908123702.88454-3-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index bee9b01c5a6be7d85583cb52c21f65cf0bc4b584..cd54d197caab9f474e9d5a0868a3da1895012b3b 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -4198,6 +4198,8 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata,
        bool authorized = false;
        bool multicast;
        unsigned char *ra = ehdr->h_dest;
+       struct tid_ampdu_tx *tid_tx;
+       u8 tid;
 
        if (IS_ERR(sta) || (sta && !sta->uploaded))
                sta = NULL;
@@ -4235,6 +4237,22 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata,
 
        memset(info, 0, sizeof(*info));
 
+       if (sta) {
+               tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;
+               tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[tid]);
+               if (tid_tx) {
+                       if (!test_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state)) {
+                               /* fall back to non-offload slow path */
+                               __ieee80211_subif_start_xmit(skb, dev, 0, 0, NULL);
+                               return;
+                       }
+
+                       info->flags |= IEEE80211_TX_CTL_AMPDU;
+                       if (tid_tx->timeout)
+                               tid_tx->last_tx = jiffies;
+               }
+       }
+
        if (unlikely(!multicast && skb->sk &&
                     skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS))
                info->ack_frame_id = ieee80211_store_ack_skb(local, skb,