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

Commit ea021f56 authored by Stone Piao's avatar Stone Piao Committed by John W. Linville
Browse files

mwifiex: append each IE into a seperate IE buffer 



When scan is triggered from cfg80211, the request contains some IEs
and we should parse all the IEs and append each IE into a seperate
IE buffer.

Signed-off-by: default avatarStone Piao <piaoyun@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 eab1c76b

drivers/net/wireless/mwifiex/cfg80211.c

+9 −4
Original line number Diff line number Diff line
@@ -1704,8 +1704,9 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, 
{

	struct net_device *dev = request->wdev->netdev;

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);

	int i;

	int i, offset;

	struct ieee80211_channel *chan;

	struct ieee_types_header *ie;



	wiphy_dbg(wiphy, "info: received scan request on %s\n", dev->name);
@@ -1728,12 +1729,16 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, 
	priv->user_scan_cfg->ssid_list = request->ssids;



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

		offset = 0;

		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);

			ie = (struct ieee_types_header *)(request->ie + offset);

			memcpy(&priv->vs_ie[i].ie, ie, sizeof(*ie) + ie->len);

			offset += sizeof(*ie) + ie->len;



			if (offset >= request->ie_len)

				break;

		}

	}