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

Commit 71954f24 authored by Ujjal Roy's avatar Ujjal Roy Committed by John W. Linville
Browse files

mwifiex: do not re-associate when already connected 



In managed mode if the driver is getting a re-associate command
from cfg80211, driver deauthenticates with the AP internally and
sends a disconnected event to cfg80211 before completion of its
association process. The disconnected event then modifies the
SSID length as wdev->ssid_len = 0. So, upon receiving the connect
result event from driver, cfg80211 is unable to get that BSS from
the device's BSS list and generates the following WARN_ON message.

WARNING: CPU: 0 PID: 857 at net/wireless/sme.c:658
         __cfg80211_connect_result+0x3a6/0x3e0 [cfg80211]()

Avoid re-association while the device is already associated to a
network. Also remove the internal deauthentication from the
association path.

Signed-off-by: default avatarUjjal Roy <royujjal@gmail.com>
Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9435d091

drivers/net/wireless/mwifiex/cfg80211.c

+5 −3
Original line number Diff line number Diff line
@@ -1604,9 +1604,6 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, 
		return -EINVAL;

	}



	/* disconnect before try to associate */

	mwifiex_deauthenticate(priv, NULL);



	/* As this is new association, clear locally stored

	 * keys and security related flags */

	priv->sec_info.wpa_enabled = false;
@@ -1744,6 +1741,11 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, 
		return -EINVAL;

	}



	if (priv->wdev && priv->wdev->current_bss) {

		wiphy_warn(wiphy, "%s: already connected\n", dev->name);

		return -EALREADY;

	}



	wiphy_dbg(wiphy, "info: Trying to associate to %s and bssid %pM\n",

		  (char *) sme->ssid, sme->bssid);

drivers/net/wireless/mwifiex/sta_ioctl.c

+0 −10
Original line number Diff line number Diff line
@@ -283,10 +283,6 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss, 
	    priv->bss_mode == NL80211_IFTYPE_P2P_CLIENT) {

		u8 config_bands;



		ret = mwifiex_deauthenticate(priv, NULL);

		if (ret)

			goto done;



		if (!bss_desc)

			return -1;
@@ -345,12 +341,6 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss, 
			goto done;

		}



		/* Exit Adhoc mode first */

		dev_dbg(adapter->dev, "info: Sending Adhoc Stop\n");

		ret = mwifiex_deauthenticate(priv, NULL);

		if (ret)

			goto done;



		priv->adhoc_is_link_sensed = false;



		ret = mwifiex_check_network_compatibility(priv, bss_desc);