writeback: limit write_cache_pages integrity scanning to current EOF

[safe/jmp/linux-2.6] / net / mac80211 / rc80211_minstrel.c

diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c
index 5bdce0c..f65ce6d 100644 (file)
--- a/net/mac80211/rc80211_minstrel.c
+++ b/net/mac80211/rc80211_minstrel.c
@@ -50,6 +50,7 @@
 #include <linux/debugfs.h>
 #include <linux/random.h>
 #include <linux/ieee80211.h>
+#include <linux/slab.h>
 #include <net/mac80211.h>
 #include "rate.h"
 #include "rc80211_minstrel.h"
@@ -70,19 +71,6 @@ rix_to_ndx(struct minstrel_sta_info *mi, int rix)
        return i;
 }
 
-static inline bool
-use_low_rate(struct sk_buff *skb)
-{
-       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
-       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-       __le16 fc;
-
-       fc = hdr->frame_control;
-
-       return ((info->flags & IEEE80211_TX_CTL_NO_ACK) || !ieee80211_is_data(fc));
-}
-
-
 static void
 minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi)
 {
@@ -231,7 +219,6 @@ minstrel_get_rate(void *priv, struct ieee80211_sta *sta,
                  void *priv_sta, struct ieee80211_tx_rate_control *txrc)
 {
        struct sk_buff *skb = txrc->skb;
-       struct ieee80211_supported_band *sband = txrc->sband;
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
        struct minstrel_sta_info *mi = priv_sta;
        struct minstrel_priv *mp = priv;
@@ -244,14 +231,8 @@ minstrel_get_rate(void *priv, struct ieee80211_sta *sta,
        int mrr_ndx[3];
        int sample_rate;
 
-       if (!sta || !mi || use_low_rate(skb)) {
-               ar[0].idx = rate_lowest_index(sband, sta);
-               if (info->flags & IEEE80211_TX_CTL_NO_ACK)
-                       ar[0].count = 1;
-               else
-                       ar[0].count = mp->max_retry;
+       if (rate_control_send_low(sta, priv_sta, txrc))
                return;
-       }
 
        mrr = mp->has_mrr && !txrc->rts && !txrc->bss_conf->use_cts_prot;
 
@@ -438,7 +419,7 @@ minstrel_rate_init(void *priv, struct ieee80211_supported_band *sband,
 
                        /* contention window */
                        tx_time_single += t_slot + min(cw, mp->cw_max);
-                       cw = (cw + 1) << 1;
+                       cw = (cw << 1) | 1;
 
                        tx_time += tx_time_single;
                        tx_time_cts += tx_time_single + mi->sp_ack_dur;
@@ -561,7 +542,7 @@ minstrel_free(void *priv)
        kfree(priv);
 }
 
-static struct rate_control_ops mac80211_minstrel = {
+struct rate_control_ops mac80211_minstrel = {
        .name = "minstrel",
        .tx_status = minstrel_tx_status,
        .get_rate = minstrel_get_rate,