aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/mac80211.h4
-rw-r--r--net/mac80211/mlme.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 446dbf75a1c5..81d706d85226 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -559,7 +559,7 @@ enum ieee80211_conf_changed {
559 * @beacon_int: beacon interval (TODO make interface config) 559 * @beacon_int: beacon interval (TODO make interface config)
560 * 560 *
561 * @listen_interval: listen interval in units of beacon interval 561 * @listen_interval: listen interval in units of beacon interval
562 * @max_sleep_interval: the maximum number of beacon intervals to sleep for 562 * @max_sleep_period: the maximum number of beacon intervals to sleep for
563 * before checking the beacon for a TIM bit (managed mode only); this 563 * before checking the beacon for a TIM bit (managed mode only); this
564 * value will be only achievable between DTIM frames, the hardware 564 * value will be only achievable between DTIM frames, the hardware
565 * needs to check for the multicast traffic bit in DTIM beacons. 565 * needs to check for the multicast traffic bit in DTIM beacons.
@@ -584,7 +584,7 @@ struct ieee80211_conf {
584 int beacon_int; 584 int beacon_int;
585 u32 flags; 585 u32 flags;
586 int power_level, dynamic_ps_timeout; 586 int power_level, dynamic_ps_timeout;
587 int max_sleep_interval; 587 int max_sleep_period;
588 588
589 u16 listen_interval; 589 u16 listen_interval;
590 bool radio_enabled; 590 bool radio_enabled;
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 2029b71eb879..f8925ca7c8f0 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -562,7 +562,7 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency)
562 maxslp = min_t(int, dtimper, 562 maxslp = min_t(int, dtimper,
563 latency / beaconint_us); 563 latency / beaconint_us);
564 564
565 local->hw.conf.max_sleep_interval = maxslp; 565 local->hw.conf.max_sleep_period = maxslp;
566 local->ps_sdata = found; 566 local->ps_sdata = found;
567 } 567 }
568 } else { 568 } else {