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

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

mwifiex: add support for WPS2.0 



This patches enables setting association request and probe request
IE for station interface. WPS exchange between WPS2.0 AP and mwifiex
STA Enrollee/External Registrar completes successfully.

Tested with wpa_supplicant 1.0 and 2.0 devel.

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 5e218b7a

drivers/net/wireless/mwifiex/cfg80211.c

+21 −0
Original line number Diff line number Diff line
@@ -1162,6 +1162,17 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev, 
	priv->user_scan_cfg->num_ssids = request->n_ssids;

	priv->user_scan_cfg->ssid_list = request->ssids;



	if (request->ie && request->ie_len) {

		for (i = 0; i < MWIFIEX_MAX_VSIE_NUM; i++) {

			if (priv->vs_ie[i].mask != MWIFIEX_VSIE_MASK_CLEAR)

				continue;

			priv->vs_ie[i].mask = MWIFIEX_VSIE_MASK_SCAN;

			memcpy(&priv->vs_ie[i].ie, request->ie,

			       request->ie_len);

			break;

		}

	}



	for (i = 0; i < request->n_channels; i++) {

		chan = request->channels[i];

		priv->user_scan_cfg->chan_list[i].chan_number = chan->hw_value;
@@ -1179,6 +1190,15 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev, 
	if (mwifiex_set_user_scan_ioctl(priv, priv->user_scan_cfg))

		return -EFAULT;



	if (request->ie && request->ie_len) {

		for (i = 0; i < MWIFIEX_MAX_VSIE_NUM; i++) {

			if (priv->vs_ie[i].mask == MWIFIEX_VSIE_MASK_SCAN) {

				priv->vs_ie[i].mask = MWIFIEX_VSIE_MASK_CLEAR;

				memset(&priv->vs_ie[i].ie, 0,

				       MWIFIEX_MAX_VSIE_LEN);

			}

		}

	}

	return 0;

}
@@ -1439,6 +1459,7 @@ int mwifiex_register_cfg80211(struct mwifiex_private *priv) 
	}

	wdev->iftype = NL80211_IFTYPE_STATION;

	wdev->wiphy->max_scan_ssids = 10;

	wdev->wiphy->max_scan_ie_len = MWIFIEX_MAX_VSIE_LEN;

	wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |

				       BIT(NL80211_IFTYPE_ADHOC);

drivers/net/wireless/mwifiex/fw.h

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { 
#define TLV_TYPE_RATE_SCOPE         (PROPRIETARY_TLV_BASE_ID + 83)

#define TLV_TYPE_POWER_GROUP        (PROPRIETARY_TLV_BASE_ID + 84)

#define TLV_TYPE_WAPI_IE            (PROPRIETARY_TLV_BASE_ID + 94)

#define TLV_TYPE_MGMT_IE            (PROPRIETARY_TLV_BASE_ID + 105)

#define TLV_TYPE_AUTO_DS_PARAM      (PROPRIETARY_TLV_BASE_ID + 113)

#define TLV_TYPE_PS_PARAM           (PROPRIETARY_TLV_BASE_ID + 114)

drivers/net/wireless/mwifiex/init.c

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ static int mwifiex_init_priv(struct mwifiex_private *priv) 
	priv->wmm_qosinfo = 0;

	priv->curr_bcn_buf = NULL;

	priv->curr_bcn_size = 0;

	priv->wps_ie = NULL;

	priv->wps_ie_len = 0;



	priv->scan_block = false;

drivers/net/wireless/mwifiex/ioctl.h

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ struct mwifiex_ds_misc_subsc_evt { 


#define MWIFIEX_MAX_VSIE_LEN       (256)

#define MWIFIEX_MAX_VSIE_NUM       (8)

#define MWIFIEX_VSIE_MASK_CLEAR    0x00

#define MWIFIEX_VSIE_MASK_SCAN     0x01

#define MWIFIEX_VSIE_MASK_ASSOC    0x02

#define MWIFIEX_VSIE_MASK_ADHOC    0x04

drivers/net/wireless/mwifiex/join.c

+44 −0
Original line number Diff line number Diff line
@@ -224,6 +224,48 @@ mwifiex_setup_rates_from_bssdesc(struct mwifiex_private *priv, 
	return 0;

}



/*

 * This function appends a WPS IE. It is called from the network join command

 * preparation routine.

 *

 * If the IE buffer has been setup by the application, this routine appends

 * the buffer as a WPS TLV type to the request.

 */

static int

mwifiex_cmd_append_wps_ie(struct mwifiex_private *priv, u8 **buffer)

{

	int retLen = 0;

	struct mwifiex_ie_types_header ie_header;



	if (!buffer || !*buffer)

		return 0;



	/*

	 * If there is a wps ie buffer setup, append it to the return

	 * parameter buffer pointer.

	 */

	if (priv->wps_ie_len) {

		dev_dbg(priv->adapter->dev, "cmd: append wps ie %d to %p\n",

			priv->wps_ie_len, *buffer);



		/* Wrap the generic IE buffer with a pass through TLV type */

		ie_header.type = cpu_to_le16(TLV_TYPE_MGMT_IE);

		ie_header.len = cpu_to_le16(priv->wps_ie_len);

		memcpy(*buffer, &ie_header, sizeof(ie_header));

		*buffer += sizeof(ie_header);

		retLen += sizeof(ie_header);



		memcpy(*buffer, priv->wps_ie, priv->wps_ie_len);

		*buffer += priv->wps_ie_len;

		retLen += priv->wps_ie_len;



	}



	kfree(priv->wps_ie);

	priv->wps_ie_len = 0;

	return retLen;

}



/*

 * This function appends a WAPI IE.

 *
@@ -480,6 +522,8 @@ int mwifiex_cmd_802_11_associate(struct mwifiex_private *priv, 
	if (priv->sec_info.wapi_enabled && priv->wapi_ie_len)

		mwifiex_cmd_append_wapi_ie(priv, &pos);



	if (priv->wps.session_enable && priv->wps_ie_len)

		mwifiex_cmd_append_wps_ie(priv, &pos);



	mwifiex_cmd_append_generic_ie(priv, &pos);