aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/agg-tx.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/agg-tx.c')
-rw-r--r--net/mac80211/agg-tx.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index 63d852cb4ca2..53defafb9aae 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -136,14 +136,6 @@ void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u1
136 ieee80211_tx_skb(sdata, skb); 136 ieee80211_tx_skb(sdata, skb);
137} 137}
138 138
139static void kfree_tid_tx(struct rcu_head *rcu_head)
140{
141 struct tid_ampdu_tx *tid_tx =
142 container_of(rcu_head, struct tid_ampdu_tx, rcu_head);
143
144 kfree(tid_tx);
145}
146
147int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, 139int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
148 enum ieee80211_back_parties initiator, 140 enum ieee80211_back_parties initiator,
149 bool tx) 141 bool tx)
@@ -163,7 +155,7 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
163 /* not even started yet! */ 155 /* not even started yet! */
164 rcu_assign_pointer(sta->ampdu_mlme.tid_tx[tid], NULL); 156 rcu_assign_pointer(sta->ampdu_mlme.tid_tx[tid], NULL);
165 spin_unlock_bh(&sta->lock); 157 spin_unlock_bh(&sta->lock);
166 call_rcu(&tid_tx->rcu_head, kfree_tid_tx); 158 kfree_rcu(tid_tx, rcu_head);
167 return 0; 159 return 0;
168 } 160 }
169 161
@@ -322,7 +314,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
322 spin_unlock_bh(&sta->lock); 314 spin_unlock_bh(&sta->lock);
323 315
324 ieee80211_wake_queue_agg(local, tid); 316 ieee80211_wake_queue_agg(local, tid);
325 call_rcu(&tid_tx->rcu_head, kfree_tid_tx); 317 kfree_rcu(tid_tx, rcu_head);
326 return; 318 return;
327 } 319 }
328 320
@@ -701,7 +693,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
701 693
702 ieee80211_agg_splice_finish(local, tid); 694 ieee80211_agg_splice_finish(local, tid);
703 695
704 call_rcu(&tid_tx->rcu_head, kfree_tid_tx); 696 kfree_rcu(tid_tx, rcu_head);
705 697
706 unlock_sta: 698 unlock_sta:
707 spin_unlock_bh(&sta->lock); 699 spin_unlock_bh(&sta->lock);