From: Johannes Berg Date: Fri, 28 Aug 2015 08:52:53 +0000 (+0200) Subject: mac80211: fix driver RSSI event calculations X-Git-Tag: v3.2.74~49 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adc82592cde76e5d6182c66bf0c67560f0ee0abf;p=pandora-kernel.git mac80211: fix driver RSSI event calculations commit 8ec6d97871f37e4743678ea4a455bd59580aa0f4 upstream. The ifmgd->ave_beacon_signal value cannot be taken as is for comparisons, it must be divided by since it's represented like that for better accuracy of the EWMA calculations. This would lead to invalid driver RSSI events. Fix the used value. Fixes: 615f7b9bb1f8 ("mac80211: add driver RSSI threshold events") Signed-off-by: Johannes Berg Signed-off-by: Ben Hutchings --- diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 9da86264e06f..ef00f2441a73 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1840,7 +1840,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, if (ifmgd->rssi_min_thold != ifmgd->rssi_max_thold && ifmgd->count_beacon_signal >= IEEE80211_SIGNAL_AVE_MIN_COUNT) { - int sig = ifmgd->ave_beacon_signal; + int sig = ifmgd->ave_beacon_signal / 16; int last_sig = ifmgd->last_ave_beacon_signal; /*