um: fix UML_LIB_PATH

[pandora-kernel.git] / net / mac80211 / agg-tx.c

diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index cd5125f..c8be8ef 100644 (file)
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -144,14 +144,6 @@ void ieee80211_assign_tid_tx(struct sta_info *sta, int tid,
        rcu_assign_pointer(sta->ampdu_mlme.tid_tx[tid], tid_tx);
 }
 
-static void kfree_tid_tx(struct rcu_head *rcu_head)
-{
-       struct tid_ampdu_tx *tid_tx =
-           container_of(rcu_head, struct tid_ampdu_tx, rcu_head);
-
-       kfree(tid_tx);
-}
-
 int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
                                    enum ieee80211_back_parties initiator,
                                    bool tx)
@@ -174,7 +166,7 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
                /* not even started yet! */
                ieee80211_assign_tid_tx(sta, tid, NULL);
                spin_unlock_bh(&sta->lock);
-               call_rcu(&tid_tx->rcu_head, kfree_tid_tx);
+               kfree_rcu(tid_tx, rcu_head);
                return 0;
        }
 
@@ -333,7 +325,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
                spin_unlock_bh(&sta->lock);
 
                ieee80211_wake_queue_agg(local, tid);
-               call_rcu(&tid_tx->rcu_head, kfree_tid_tx);
+               kfree_rcu(tid_tx, rcu_head);
                return;
        }
 
@@ -718,7 +710,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
 
        ieee80211_agg_splice_finish(local, tid);
 
-       call_rcu(&tid_tx->rcu_head, kfree_tid_tx);
+       kfree_rcu(tid_tx, rcu_head);
 
  unlock_sta:
        spin_unlock_bh(&sta->lock);