mac80211: make align adjustment code support paged SKB

[safe/jmp/linux-2.6] / net / mac80211 / rate.h

diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h
index eb94e58..2ab5ad9 100644 (file)
--- a/net/mac80211/rate.h
+++ b/net/mac80211/rate.h
@@ -31,9 +31,8 @@ struct rate_control_ref {
 struct rate_control_ref *rate_control_alloc(const char *name,
                                            struct ieee80211_local *local);
 void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
-                          struct ieee80211_supported_band *sband,
-                          struct sta_info *sta, struct sk_buff *skb,
-                          struct rate_selection *sel);
+                          struct sta_info *sta,
+                          struct ieee80211_tx_rate_control *txrc);
 struct rate_control_ref *rate_control_get(struct rate_control_ref *ref);
 void rate_control_put(struct rate_control_ref *ref);
 
@@ -45,8 +44,10 @@ static inline void rate_control_tx_status(struct ieee80211_local *local,
        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);
 
-       ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);
+       if (likely(info->flags & IEEE80211_TX_INTFL_RCALGO))
+               ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);
 }
 
 
@@ -63,11 +64,17 @@ static inline void rate_control_rate_init(struct sta_info *sta)
        ref->ops->rate_init(ref->priv, sband, ista, priv_sta);
 }
 
-
-static inline void rate_control_clear(struct ieee80211_local *local)
+static inline void rate_control_rate_update(struct ieee80211_local *local,
+                                   struct ieee80211_supported_band *sband,
+                                   struct sta_info *sta, u32 changed)
 {
        struct rate_control_ref *ref = local->rate_ctrl;
-       ref->ops->clear(ref->priv);
+       struct ieee80211_sta *ista = &sta->sta;
+       void *priv_sta = sta->rate_ctrl_priv;
+
+       if (ref->ops->rate_update)
+               ref->ops->rate_update(ref->priv, sband, ista,
+                                     priv_sta, changed);
 }
 
 static inline void *rate_control_alloc_sta(struct rate_control_ref *ref,
@@ -125,4 +132,18 @@ static inline void rc80211_pid_exit(void)
 }
 #endif
 
+#ifdef CONFIG_MAC80211_RC_MINSTREL
+extern int rc80211_minstrel_init(void);
+extern void rc80211_minstrel_exit(void);
+#else
+static inline int rc80211_minstrel_init(void)
+{
+       return 0;
+}
+static inline void rc80211_minstrel_exit(void)
+{
+}
+#endif
+
+
 #endif /* IEEE80211_RATE_H */