Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-microblaze.git] / net / mac80211 / rate.h

diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h
index f7825ef..8212bfe 100644 (file)
--- a/net/mac80211/rate.h
+++ b/net/mac80211/rate.h
@@ -28,47 +28,9 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
                           struct sta_info *sta,
                           struct ieee80211_tx_rate_control *txrc);
 
-static inline void rate_control_tx_status(struct ieee80211_local *local,
-                                         struct ieee80211_supported_band *sband,
-                                         struct sta_info *sta,
-                                         struct sk_buff *skb)
-{
-       struct rate_control_ref *ref = local->rate_ctrl;
-       struct ieee80211_sta *ista = &sta->sta;
-       void *priv_sta = sta->rate_ctrl_priv;
-       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-
-       if (!ref || !test_sta_flag(sta, WLAN_STA_RATE_CONTROL))
-               return;
-
-       spin_lock_bh(&sta->rate_ctrl_lock);
-       if (ref->ops->tx_status)
-               ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);
-       else
-               ref->ops->tx_status_noskb(ref->priv, sband, ista, priv_sta, info);
-       spin_unlock_bh(&sta->rate_ctrl_lock);
-}
-
-static inline void
-rate_control_tx_status_noskb(struct ieee80211_local *local,
-                            struct ieee80211_supported_band *sband,
-                            struct sta_info *sta,
-                            struct ieee80211_tx_info *info)
-{
-       struct rate_control_ref *ref = local->rate_ctrl;
-       struct ieee80211_sta *ista = &sta->sta;
-       void *priv_sta = sta->rate_ctrl_priv;
-
-       if (!ref || !test_sta_flag(sta, WLAN_STA_RATE_CONTROL))
-               return;
-
-       if (WARN_ON_ONCE(!ref->ops->tx_status_noskb))
-               return;
-
-       spin_lock_bh(&sta->rate_ctrl_lock);
-       ref->ops->tx_status_noskb(ref->priv, sband, ista, priv_sta, info);
-       spin_unlock_bh(&sta->rate_ctrl_lock);
-}
+void rate_control_tx_status(struct ieee80211_local *local,
+                           struct ieee80211_supported_band *sband,
+                           struct ieee80211_tx_status *st);
 
 void rate_control_rate_init(struct sta_info *sta);
 void rate_control_rate_update(struct ieee80211_local *local,