diff options
author | David S. Miller <davem@davemloft.net> | 2017-03-02 14:39:17 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-03-02 14:39:17 -0800 |
commit | 35576ee17f7c15a5ec776570088fd2eff1dbdc2d (patch) | |
tree | f48759bbfa6184f13a83c19c36c006799432daec /net/mac80211 | |
parent | 1c296a3ea853ca785351fe4e6f389a967758ac60 (diff) | |
parent | eb1e011a14748a1d9df9a7d7df9a5711721a1bdb (diff) | |
download | linux-35576ee17f7c15a5ec776570088fd2eff1dbdc2d.tar.bz2 |
Merge tag 'mac80211-for-davem-2017-03-02' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
This contains just the average.h change in order to get it
into the tree before adding new users through -next trees.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 2 | ||||
-rw-r--r-- | net/mac80211/sta_info.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 159a1a733725..0e718437d080 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -428,7 +428,7 @@ struct ieee80211_sta_tx_tspec { bool downgraded; }; -DECLARE_EWMA(beacon_signal, 16, 4) +DECLARE_EWMA(beacon_signal, 4, 4) struct ieee80211_if_managed { struct timer_list timer; diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 15599c70a38f..e65cda34d2bc 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -372,7 +372,7 @@ struct mesh_sta { unsigned int fail_avg; }; -DECLARE_EWMA(signal, 1024, 8) +DECLARE_EWMA(signal, 10, 8) struct ieee80211_sta_rx_stats { unsigned long packets; |