Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd

[pandora-kernel.git] / net / mac80211 / rc80211_minstrel.h

diff --git a/net/mac80211/rc80211_minstrel.h b/net/mac80211/rc80211_minstrel.h
index 9a90a6a..869fe0e 100644 (file)
--- a/net/mac80211/rc80211_minstrel.h
+++ b/net/mac80211/rc80211_minstrel.h
@@ -16,6 +16,7 @@ struct minstrel_rate {
        unsigned int perfect_tx_time;
        unsigned int ack_time;
 
+       int sample_limit;
        unsigned int retry_count;
        unsigned int retry_count_cts;
        unsigned int retry_count_rtscts;
@@ -57,6 +58,7 @@ struct minstrel_sta_info {
 
        int n_rates;
        struct minstrel_rate *r;
+       bool prev_sample;
 
        /* sampling table */
        u8 *sample_table;