Patch "rtlwifi: rtl8192c: Prevent reconnect attempts if not connected" has been added to the 3.13-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: rtl8192c: Prevent reconnect attempts if not connected

to the 3.13-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-rtl8192c-prevent-reconnect-attempts-if-not-connected.patch
and it can be found in the queue-3.13 subdirectory.

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


>From 8fd77aec1a9d6f4328fc0244f21932114e066df3 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Mon, 18 Nov 2013 11:11:25 -0600
Subject: rtlwifi: rtl8192c: Prevent reconnect attempts if not connected

From: Larry Finger <Larry.Finger@xxxxxxxxxxxx>

commit 8fd77aec1a9d6f4328fc0244f21932114e066df3 upstream.

This driver has a watchdog timer that attempts to reconnect when beacon frames
are not seen for 6 seconds. This patch disables that reconnect whenever the
device has never been connected.

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/base.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -1437,7 +1437,8 @@ void rtl_watchdog_wq_callback(void *data
 			/* if we can't recv beacon for 6s, we should
 			 * reconnect this AP
 			 */
-			if (rtlpriv->link_info.roam_times >= 3) {
+			if ((rtlpriv->link_info.roam_times >= 3) &&
+			    !is_zero_ether_addr(rtlpriv->mac80211.bssid)) {
 				RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
 					 "AP off, try to reconnect now\n");
 				rtlpriv->link_info.roam_times = 0;


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

queue-3.13/b43-fix-lockdep-splat.patch
queue-3.13/staging-r8712u-set-device-type-to-wlan.patch
queue-3.13/rtlwifi-redo-register-save-locations.patch
queue-3.13/rtlwifi-rtl8192cu-add-new-device-id.patch
queue-3.13/rtlwifi-rtl8192c-add-new-definitions-in-the-dm_common-header.patch
queue-3.13/rtlwifi-rtl8192c-update-dynamic-gain-calculations.patch
queue-3.13/b43-fix-the-wrong-assignment-of-status.freq-in-b43_rx.patch
queue-3.13/b43-fix-unload-oops-if-firmware-is-not-available.patch
queue-3.13/rtlwifi-rtl8192cu-add-new-firmware.patch
queue-3.13/b43legacy-fix-unload-oops-if-firmware-is-not-available.patch
queue-3.13/rtlwifi-rtl8192cu-fix-some-code-in-rf-handling.patch
queue-3.13/rtlwifi-set-the-link-state.patch
queue-3.13/rtlwifi-increase-the-rx-queue-length-for-usb-drivers.patch
queue-3.13/rtlwifi-rtl8192c-add-routines-to-save-restore-power-index-registers.patch
queue-3.13/rtlwifi-rtl8192c-prevent-reconnect-attempts-if-not-connected.patch
queue-3.13/rtlwifi-rtl8188ee-fix-typo-in-code.patch
queue-3.13/rtlwifi-rtl8192cu-update-the-power-index-registers.patch
queue-3.13/rtlwifi-add-missing-code-to-pwdb-statics-routine.patch
queue-3.13/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]