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

mwifiex: delete IEs when stop_ap 



Delete custom IEs set by start_ap cfg80211 handler when stop_ap
handler is called for AP interface.
IE index required for deletion is stored in mwifiex_private
structure.

Signed-off-by: default avatarAvinash Patil <patila@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 f31acabe

drivers/net/wireless/mwifiex/cfg80211.c

+3 −0
Original line number Diff line number Diff line
@@ -929,6 +929,9 @@ static int mwifiex_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *dev) 
{

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);



	if (mwifiex_del_mgmt_ies(priv))

		wiphy_err(wiphy, "Failed to delete mgmt IEs!\n");



	if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_UAP_BSS_STOP,

				  HostCmd_ACT_GEN_SET, 0, NULL)) {

		wiphy_err(wiphy, "Failed to stop the BSS\n");

drivers/net/wireless/mwifiex/ie.c

+71 −0
Original line number Diff line number Diff line
@@ -323,3 +323,74 @@ done: 


	return ret;

}



/* This function removes management IE set */

int mwifiex_del_mgmt_ies(struct mwifiex_private *priv)

{

	struct mwifiex_ie *beacon_ie = NULL, *pr_ie = NULL;

	struct mwifiex_ie *ar_ie = NULL, *rsn_ie = NULL;

	int ret = 0;



	if (priv->rsn_idx != MWIFIEX_AUTO_IDX_MASK) {

		rsn_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);

		if (!rsn_ie)

			return -ENOMEM;



		rsn_ie->ie_index = cpu_to_le16(priv->rsn_idx);

		rsn_ie->mgmt_subtype_mask = cpu_to_le16(MWIFIEX_DELETE_MASK);

		rsn_ie->ie_length = 0;

		if (mwifiex_update_uap_custom_ie(priv, rsn_ie, &priv->rsn_idx,

						 NULL, &priv->proberesp_idx,

						 NULL, &priv->assocresp_idx)) {

			ret = -1;

			goto done;

		}



		priv->rsn_idx = MWIFIEX_AUTO_IDX_MASK;

	}



	if (priv->beacon_idx != MWIFIEX_AUTO_IDX_MASK) {

		beacon_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);

		if (!beacon_ie) {

			ret = -ENOMEM;

			goto done;

		}

		beacon_ie->ie_index = cpu_to_le16(priv->beacon_idx);

		beacon_ie->mgmt_subtype_mask = cpu_to_le16(MWIFIEX_DELETE_MASK);

		beacon_ie->ie_length = 0;

	}

	if (priv->proberesp_idx != MWIFIEX_AUTO_IDX_MASK) {

		pr_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);

		if (!pr_ie) {

			ret = -ENOMEM;

			goto done;

		}

		pr_ie->ie_index = cpu_to_le16(priv->proberesp_idx);

		pr_ie->mgmt_subtype_mask = cpu_to_le16(MWIFIEX_DELETE_MASK);

		pr_ie->ie_length = 0;

	}

	if (priv->assocresp_idx != MWIFIEX_AUTO_IDX_MASK) {

		ar_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);

		if (!ar_ie) {

			ret = -ENOMEM;

			goto done;

		}

		ar_ie->ie_index = cpu_to_le16(priv->assocresp_idx);

		ar_ie->mgmt_subtype_mask = cpu_to_le16(MWIFIEX_DELETE_MASK);

		ar_ie->ie_length = 0;

	}



	if (beacon_ie || pr_ie || ar_ie)

		ret = mwifiex_update_uap_custom_ie(priv,

						   beacon_ie, &priv->beacon_idx,

						   pr_ie, &priv->proberesp_idx,

						   ar_ie, &priv->assocresp_idx);



done:

	kfree(beacon_ie);

	kfree(pr_ie);

	kfree(ar_ie);

	kfree(rsn_ie);



	return ret;

}

drivers/net/wireless/mwifiex/main.h

+1 −0
Original line number Diff line number Diff line
@@ -1007,6 +1007,7 @@ void mwifiex_set_sys_config_invalid_data(struct mwifiex_uap_bss_param *config); 


int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,

			 struct cfg80211_ap_settings *params);

int mwifiex_del_mgmt_ies(struct mwifiex_private *priv);

u8 *mwifiex_11d_code_2_region(u8 code);



#ifdef CONFIG_DEBUG_FS

CRA Git | Maintained and supported by SUSTech CRA and CCSE