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

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

mwifiex: handle station specific commands on STA interface only 



Commands like IBSS coalescing status, power save, 11D should be
handled only when bss_type is STA.

Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarKiran Divekar <dkiran@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 64b05e2f

drivers/net/wireless/mwifiex/cmdevt.c

+5 −0
Original line number Diff line number Diff line
@@ -440,6 +440,11 @@ int mwifiex_process_event(struct mwifiex_adapter *adapter) 
		do_gettimeofday(&tstamp);

		dev_dbg(adapter->dev, "event: %lu.%lu: cause: %#x\n",

			tstamp.tv_sec, tstamp.tv_usec, eventcause);

	} else {

		/* Handle PS_SLEEP/AWAKE events on STA */

		priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);

		if (!priv)

			priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);

	}



	ret = mwifiex_process_sta_event(priv);

drivers/net/wireless/mwifiex/sta_cmd.c

+29 −20
Original line number Diff line number Diff line
@@ -1248,14 +1248,16 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta) 
		if (ret)

			return -1;



		if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {

			/* Enable IEEE PS by default */

			priv->adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_PSP;

		ret = mwifiex_send_cmd_async(priv,

					     HostCmd_CMD_802_11_PS_MODE_ENH,

			ret = mwifiex_send_cmd_async(

					priv, HostCmd_CMD_802_11_PS_MODE_ENH,

					EN_AUTO_PS, BITMAP_STA_PS, NULL);

			if (ret)

				return -1;

		}

	}



	/* get tx rate */

	ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_TX_RATE_CFG,
@@ -1270,12 +1272,14 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta) 
	if (ret)

		return -1;



	if (priv->bss_type == MWIFIEX_BSS_TYPE_STA) {

		/* set ibss coalescing_status */

	ret = mwifiex_send_cmd_async(priv,

				     HostCmd_CMD_802_11_IBSS_COALESCING_STATUS,

		ret = mwifiex_send_cmd_async(

				priv, HostCmd_CMD_802_11_IBSS_COALESCING_STATUS,

				HostCmd_ACT_GEN_SET, 0, &enable);

		if (ret)

			return -1;

	}



	memset(&amsdu_aggr_ctrl, 0, sizeof(amsdu_aggr_ctrl));

	amsdu_aggr_ctrl.enable = true;
@@ -1293,7 +1297,8 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta) 
	if (ret)

		return -1;



	if (first_sta && (priv->adapter->iface_type != MWIFIEX_USB)) {

	if (first_sta && priv->adapter->iface_type != MWIFIEX_USB &&

	    priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {

		/* Enable auto deep sleep */

		auto_ds.auto_ds = DEEP_SLEEP_ON;

		auto_ds.idle_time = DEEP_SLEEP_IDLE_TIME;
@@ -1305,12 +1310,16 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta) 
			return -1;

	}



	if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {

		/* Send cmd to FW to enable/disable 11D function */

		state_11d = ENABLE_11D;

		ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_802_11_SNMP_MIB,

				     HostCmd_ACT_GEN_SET, DOT11D_I, &state_11d);

					     HostCmd_ACT_GEN_SET, DOT11D_I,

					     &state_11d);

		if (ret)

		dev_err(priv->adapter->dev, "11D: failed to enable 11D\n");

			dev_err(priv->adapter->dev,

				"11D: failed to enable 11D\n");

	}



	/* Send cmd to FW to configure 11n specific configuration

	 * (Short GI, Channel BW, Green field support etc.) for transmit