diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2013-11-18 11:11:25 -0600 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-05 14:55:02 -0500 |
| commit | 8fd77aec1a9d6f4328fc0244f21932114e066df3 (patch) | |
| tree | ec6bc50b4fd022e1edaf9e1ce31adc848b038793 /drivers/net/wireless/rtlwifi | |
| parent | ac0ef8139bc4f6493b6bb560bfeb31b883b7e8ae (diff) | |
rtlwifi: rtl8192c: Prevent reconnect attempts if not connected
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@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index ff784072fb42..fcf9b621918c 100644 --- 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; |