mac80211: rename max_sleep_interval to max_sleep_period

Kalle points out that max_sleep_interval is somewhat confusing
because the value is measured in beacon intervals, and not in
TU. Rename it to max_sleep_period to be consistent with things
like DTIM period that are also measured in beacon intervals.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 446dbf75a1c52fc5fe914266c54263adc3b2a2a6..81d706d8522692d597f80f25e9c4a684410bdf2f 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -559,7 +559,7 @@ enum ieee80211_conf_changed {
  * @beacon_int: beacon interval (TODO make interface config)
  *
  * @listen_interval: listen interval in units of beacon interval
- * @max_sleep_interval: the maximum number of beacon intervals to sleep for
+ * @max_sleep_period: the maximum number of beacon intervals to sleep for
  *     before checking the beacon for a TIM bit (managed mode only); this
  *     value will be only achievable between DTIM frames, the hardware
  *     needs to check for the multicast traffic bit in DTIM beacons.
@@ -584,7 +584,7 @@ struct ieee80211_conf {
        int beacon_int;
        u32 flags;
        int power_level, dynamic_ps_timeout;
-       int max_sleep_interval;
+       int max_sleep_period;
 
        u16 listen_interval;
        bool radio_enabled;

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 2029b71eb87907fa1cf35f0978bbc8d85736448d..f8925ca7c8f0f19697ca8d29738916851e41c918 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -562,7 +562,7 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency)
                                maxslp = min_t(int, dtimper,
                                                    latency / beaconint_us);
 
-                       local->hw.conf.max_sleep_interval = maxslp;
+                       local->hw.conf.max_sleep_period = maxslp;
                        local->ps_sdata = found;
                }
        } else {