|
@@ -2479,6 +2479,11 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid)
|
|
|
{
|
|
|
struct sk_buff_head frames;
|
|
|
struct ieee80211_rx_data rx = { };
|
|
|
+ struct tid_ampdu_rx *tid_agg_rx;
|
|
|
+
|
|
|
+ tid_agg_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[tid]);
|
|
|
+ if (!tid_agg_rx)
|
|
|
+ return;
|
|
|
|
|
|
__skb_queue_head_init(&frames);
|
|
|
|
|
@@ -2493,10 +2498,9 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid)
|
|
|
test_bit(SCAN_OFF_CHANNEL, &sta->local->scanning)))
|
|
|
rx.flags |= IEEE80211_RX_IN_SCAN;
|
|
|
|
|
|
- spin_lock(&sta->ampdu_mlme.tid_rx[tid]->reorder_lock);
|
|
|
- ieee80211_sta_reorder_release(&sta->local->hw,
|
|
|
- sta->ampdu_mlme.tid_rx[tid], &frames);
|
|
|
- spin_unlock(&sta->ampdu_mlme.tid_rx[tid]->reorder_lock);
|
|
|
+ spin_lock(&tid_agg_rx->reorder_lock);
|
|
|
+ ieee80211_sta_reorder_release(&sta->local->hw, tid_agg_rx, &frames);
|
|
|
+ spin_unlock(&tid_agg_rx->reorder_lock);
|
|
|
|
|
|
ieee80211_rx_handlers(&rx, &frames);
|
|
|
}
|