Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next

[cascardo/linux.git] / net / mac80211 / rc80211_minstrel.h

diff --git a/net/mac80211/rc80211_minstrel.h b/net/mac80211/rc80211_minstrel.h
index 97eca86..410efe6 100644 (file)
--- a/net/mac80211/rc80211_minstrel.h
+++ b/net/mac80211/rc80211_minstrel.h
@@ -33,8 +33,8 @@ minstrel_ewma(int old, int new, int weight)
 
 struct minstrel_rate_stats {
        /* current / last sampling period attempts/success counters */
-       unsigned int attempts, last_attempts;
-       unsigned int success, last_success;
+       u16 attempts, last_attempts;
+       u16 success, last_success;
 
        /* total attempts/success counters */
        u64 att_hist, succ_hist;
@@ -46,8 +46,8 @@ struct minstrel_rate_stats {
        unsigned int cur_prob, probability;
 
        /* maximum retry counts */
-       unsigned int retry_count;
-       unsigned int retry_count_rtscts;
+       u8 retry_count;
+       u8 retry_count_rtscts;
 
        u8 sample_skipped;
        bool retry_updated;
@@ -55,14 +55,15 @@ struct minstrel_rate_stats {
 
 struct minstrel_rate {
        int bitrate;
-       int rix;
+
+       s8 rix;
+       u8 retry_count_cts;
+       u8 adjusted_retry_count;
 
        unsigned int perfect_tx_time;
        unsigned int ack_time;
 
        int sample_limit;
-       unsigned int retry_count_cts;
-       unsigned int adjusted_retry_count;
 
        struct minstrel_rate_stats stats;
 };