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

Commit b338f74e authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by John W. Linville
Browse files

wil6210: Don't use wdev->sme_state 



sme_state is private wdev's variable.
Track connection state internally

Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent adc2d122

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

+4 −0
Original line number Diff line number Diff line
@@ -322,12 +322,16 @@ static int wil_cfg80211_connect(struct wiphy *wiphy, 
	 * FW don't support scan after connection attempt

	 */

	set_bit(wil_status_dontscan, &wil->status);

	set_bit(wil_status_fwconnecting, &wil->status);



	rc = wmi_send(wil, WMI_CONNECT_CMDID, &conn, sizeof(conn));

	if (rc == 0) {

		/* Connect can take lots of time */

		mod_timer(&wil->connect_timer,

			  jiffies + msecs_to_jiffies(2000));

	} else {

		clear_bit(wil_status_dontscan, &wil->status);

		clear_bit(wil_status_fwconnecting, &wil->status);

	}



 out:

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

+6 −12
Original line number Diff line number Diff line
@@ -56,27 +56,21 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, void *bssid) 
{

	uint i;

	struct net_device *ndev = wil_to_ndev(wil);

	struct wireless_dev *wdev = wil->wdev;



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



	wil_link_off(wil);

	if (test_bit(wil_status_fwconnected, &wil->status)) {

		clear_bit(wil_status_fwconnected, &wil->status);



	switch (wdev->sme_state) {

	case CFG80211_SME_CONNECTED:

		cfg80211_disconnected(ndev, WLAN_STATUS_UNSPECIFIED_FAILURE,

		cfg80211_disconnected(ndev,

				      WLAN_STATUS_UNSPECIFIED_FAILURE,

				      NULL, 0, GFP_KERNEL);

		break;

	case CFG80211_SME_CONNECTING:

	} else if (test_bit(wil_status_fwconnecting, &wil->status)) {

		cfg80211_connect_result(ndev, bssid, NULL, 0, NULL, 0,

					WLAN_STATUS_UNSPECIFIED_FAILURE,

					GFP_KERNEL);

		break;

	default:

		break;

	}



	clear_bit(wil_status_fwconnecting, &wil->status);

	for (i = 0; i < ARRAY_SIZE(wil->vring_tx); i++)

		wil_vring_fini_tx(wil, i);

drivers/net/wireless/ath/wil6210/wil6210.h

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ struct vring { 


enum { /* for wil6210_priv.status */

	wil_status_fwready = 0,

	wil_status_fwconnecting,

	wil_status_fwconnected,

	wil_status_dontscan,

	wil_status_reset_done,

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

+2 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static void wmi_evt_connect(struct wil6210_priv *wil, int id, void *d, int len) 


	if ((wdev->iftype == NL80211_IFTYPE_STATION) ||

	    (wdev->iftype == NL80211_IFTYPE_P2P_CLIENT)) {

		if (wdev->sme_state != CFG80211_SME_CONNECTING) {

		if (!test_bit(wil_status_fwconnecting, &wil->status)) {

			wil_err(wil, "Not in connecting state\n");

			return;

		}
@@ -433,6 +433,7 @@ static void wmi_evt_connect(struct wil6210_priv *wil, int id, void *d, int len) 


		cfg80211_new_sta(ndev, evt->bssid, &sinfo, GFP_KERNEL);

	}

	clear_bit(wil_status_fwconnecting, &wil->status);

	set_bit(wil_status_fwconnected, &wil->status);



	/* FIXME FW can transmit only ucast frames to peer */