Patch "rtlwifi: Add missing code to PWDB statics routine" has been added to the 3.10-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    rtlwifi: Add missing code to PWDB statics routine

to the 3.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     rtlwifi-add-missing-code-to-pwdb-statics-routine.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


>From d82403a9f407217b6aed5260aa92a120e8e98310 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Mon, 18 Nov 2013 11:11:35 -0600
Subject: rtlwifi: Add missing code to PWDB statics routine

From: Larry Finger <Larry.Finger@xxxxxxxxxxxx>

commit d82403a9f407217b6aed5260aa92a120e8e98310 upstream.

Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
 drivers/net/wireless/rtlwifi/stats.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- a/drivers/net/wireless/rtlwifi/stats.c
+++ b/drivers/net/wireless/rtlwifi/stats.c
@@ -176,6 +176,7 @@ static void rtl_process_pwdb(struct ieee
 	struct rtl_sta_info *drv_priv = NULL;
 	struct ieee80211_sta *sta = NULL;
 	long undec_sm_pwdb;
+	long undec_sm_cck;
 
 	rcu_read_lock();
 	if (rtlpriv->mac80211.opmode != NL80211_IFTYPE_STATION)
@@ -185,12 +186,16 @@ static void rtl_process_pwdb(struct ieee
 	if (sta) {
 		drv_priv = (struct rtl_sta_info *) sta->drv_priv;
 		undec_sm_pwdb = drv_priv->rssi_stat.undec_sm_pwdb;
+		undec_sm_cck = drv_priv->rssi_stat.undec_sm_cck;
 	} else {
 		undec_sm_pwdb = rtlpriv->dm.undec_sm_pwdb;
+		undec_sm_cck = rtlpriv->dm.undec_sm_cck;
 	}
 
 	if (undec_sm_pwdb < 0)
 		undec_sm_pwdb = pstatus->rx_pwdb_all;
+	if (undec_sm_cck < 0)
+		undec_sm_cck = pstatus->rx_pwdb_all;
 	if (pstatus->rx_pwdb_all > (u32) undec_sm_pwdb) {
 		undec_sm_pwdb = (((undec_sm_pwdb) *
 		      (RX_SMOOTH_FACTOR - 1)) +
@@ -200,6 +205,15 @@ static void rtl_process_pwdb(struct ieee
 		undec_sm_pwdb = (((undec_sm_pwdb) * (RX_SMOOTH_FACTOR - 1)) +
 		     (pstatus->rx_pwdb_all)) / (RX_SMOOTH_FACTOR);
 	}
+	if (pstatus->rx_pwdb_all > (u32) undec_sm_cck) {
+		undec_sm_cck = (((undec_sm_pwdb) *
+		      (RX_SMOOTH_FACTOR - 1)) +
+		     (pstatus->rx_pwdb_all)) / (RX_SMOOTH_FACTOR);
+		undec_sm_cck = undec_sm_cck + 1;
+	} else {
+		undec_sm_pwdb = (((undec_sm_cck) * (RX_SMOOTH_FACTOR - 1)) +
+		     (pstatus->rx_pwdb_all)) / (RX_SMOOTH_FACTOR);
+	}
 
 	if (sta) {
 		drv_priv->rssi_stat.undec_sm_pwdb = undec_sm_pwdb;


Patches currently in stable-queue which might be from Larry.Finger@xxxxxxxxxxxx are

queue-3.10/b43-fix-lockdep-splat.patch
queue-3.10/staging-r8712u-set-device-type-to-wlan.patch
queue-3.10/rtlwifi-redo-register-save-locations.patch
queue-3.10/rtlwifi-rtl8192cu-add-new-device-id.patch
queue-3.10/rtlwifi-rtl8192c-add-new-definitions-in-the-dm_common-header.patch
queue-3.10/b43-fix-the-wrong-assignment-of-status.freq-in-b43_rx.patch
queue-3.10/b43-fix-unload-oops-if-firmware-is-not-available.patch
queue-3.10/rtlwifi-rtl8192cu-add-new-firmware.patch
queue-3.10/b43legacy-fix-unload-oops-if-firmware-is-not-available.patch
queue-3.10/rtlwifi-rtl8192cu-fix-some-code-in-rf-handling.patch
queue-3.10/rtlwifi-set-the-link-state.patch
queue-3.10/rtlwifi-increase-the-rx-queue-length-for-usb-drivers.patch
queue-3.10/rtlwifi-rtl8192c-add-routines-to-save-restore-power-index-registers.patch
queue-3.10/rtlwifi-rtl8192c-prevent-reconnect-attempts-if-not-connected.patch
queue-3.10/rtlwifi-rtl8188ee-fix-typo-in-code.patch
queue-3.10/rtlwifi-rtl8192cu-update-the-power-index-registers.patch
queue-3.10/rtlwifi-add-missing-code-to-pwdb-statics-routine.patch
queue-3.10/rtlwifi-update-beacon-statistics-for-usb-driver.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]