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

Commit e2188822 authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by Ian Maund
Browse files

wil6210: fix disconnect 1 STA in AP 



When disconnecting single STA in AP, it might be that STA
in question is already disconnected. In this case, need to do nothing.
Previously, it was mis-interpreted as "disconnect all"

Change-Id: Id117c0df65ec5c1e1abbe66bb15607f2a5d9406f
Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Git-commit: 100106d7021fe34ba4d0195a519aa5e2ecae82ab
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git


Signed-off-by: default avatarHamad Kadmany <hkadmany@codeaurora.org>
parent b6a694b8

drivers/net/wireless/ath/wil6210/main.c

+20 −9
Original line number Diff line number Diff line
@@ -188,18 +188,29 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, void *bssid, 
	struct wireless_dev *wdev = wil->wdev;



	might_sleep();

	if (bssid) {

		cid = wil_find_cid(wil, bssid);

		wil_dbg_misc(wil, "%s(%pM, CID %d)\n", __func__, bssid, cid);

	} else {

		wil_dbg_misc(wil, "%s(all)\n", __func__);

	}

	wil_dbg_misc(wil, "%s(bssid=%pM, reason=%d, ev%s)\n", __func__, bssid,

		     reason_code, from_event ? "+" : "-");



	/* Cases are:

	 * - disconnect single STA, still connected

	 * - disconnect single STA, already disconnected

	 * - disconnect all

	 *

	 * For "disconnect all", there are 2 options:

	 * - bssid == NULL

	 * - bssid is our MAC address

	 */

	if (bssid && memcmp(ndev->dev_addr, bssid, ETH_ALEN)) {

		cid = wil_find_cid(wil, bssid);

		wil_dbg_misc(wil, "Disconnect %pM, CID=%d, reason=%d\n",

			     bssid, cid, reason_code);

		if (cid >= 0) /* disconnect 1 peer */

			wil_disconnect_cid(wil, cid, reason_code, from_event);

	else /* disconnect all */

	} else { /* all */

		wil_dbg_misc(wil, "Disconnect all\n");

		for (cid = 0; cid < WIL6210_MAX_CID; cid++)

			wil_disconnect_cid(wil, cid, reason_code, from_event);

	}



	/* link state */

	switch (wdev->iftype) {