Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8d2e878 authored by Daniel Kim's avatar Daniel Kim Committed by John W. Linville
Browse files

brcmfmac: Fix reconnect failure after beacon timeout 



The DISASSOC command needs to be sent to firmware when a connection
loss is detected by firmware (e.g., beacon timeout). Otherwise the
next connect request fails due to a lingering LINK(down) event from
firmware. This patch resolves the issue by using brcmf_link_down()
handler, instead of the incomplete duplicated codes.

Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarDaniel Kim <dekim@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3e99b08a

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+0 −11
Original line number Diff line number Diff line
@@ -4687,7 +4687,6 @@ brcmf_notify_connect_status(struct brcmf_if *ifp, 
	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;

	struct ieee80211_channel *chan;

	s32 err = 0;

	u16 reason;



	if (brcmf_is_apmode(ifp->vif)) {

		err = brcmf_notify_connect_status_ap(cfg, ndev, e, data);
@@ -4708,16 +4707,6 @@ brcmf_notify_connect_status(struct brcmf_if *ifp, 
		brcmf_dbg(CONN, "Linkdown\n");

		if (!brcmf_is_ibssmode(ifp->vif)) {

			brcmf_bss_connect_done(cfg, ndev, e, false);

			if (test_and_clear_bit(BRCMF_VIF_STATUS_CONNECTED,

					       &ifp->vif->sme_state)) {

				reason = 0;

				if (((e->event_code == BRCMF_E_DEAUTH_IND) ||

				     (e->event_code == BRCMF_E_DISASSOC_IND)) &&

				    (e->reason != WLAN_REASON_UNSPECIFIED))

					reason = e->reason;

				cfg80211_disconnected(ndev, reason, NULL, 0,

						      GFP_KERNEL);

			}

		}

		brcmf_link_down(ifp->vif);

		brcmf_init_prof(ndev_to_prof(ndev));