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

Commit 953b3539 authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville
Browse files

mwifiex: check for bss_role instead of bss_mode for STA operations 



This patch fixes an issue wherein association would fail on P2P
interfaces. This happened because we are checking priv->mode
against NL80211_IFTYPE_STATION. While this check is correct for
infrastructure stations, it would fail P2P clients for which mode
is NL80211_IFTYPE_P2P_CLIENT.

Better check would be bss_role which has only 2 values: STA/AP.

Cc: <stable@vger.kernel.org> # 3.10.y
Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarStone Piao <piaoyun@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 161915a0

drivers/net/wireless/mwifiex/cfg80211.c

+2 −2
Original line number Diff line number Diff line
@@ -1716,9 +1716,9 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, 
	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);

	int ret;



	if (priv->bss_mode != NL80211_IFTYPE_STATION) {

	if (GET_BSS_ROLE(priv) != MWIFIEX_BSS_ROLE_STA) {

		wiphy_err(wiphy,

			  "%s: reject infra assoc request in non-STA mode\n",

			  "%s: reject infra assoc request in non-STA role\n",

			  dev->name);

		return -EINVAL;

	}

drivers/net/wireless/mwifiex/join.c

+4 −2
Original line number Diff line number Diff line
@@ -1291,8 +1291,10 @@ int mwifiex_associate(struct mwifiex_private *priv, 
{

	u8 current_bssid[ETH_ALEN];



	/* Return error if the adapter or table entry is not marked as infra */

	if ((priv->bss_mode != NL80211_IFTYPE_STATION) ||

	/* Return error if the adapter is not STA role or table entry

	 * is not marked as infra.

	 */

	if ((GET_BSS_ROLE(priv) != MWIFIEX_BSS_ROLE_STA) ||

	    (bss_desc->bss_mode != NL80211_IFTYPE_STATION))

		return -1;