evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mwifiex: append each IE into a seperate IE buffer

Browse source 
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: Stone Piao <piaoyun@marvell.com>
Signed-off-by: Kiran Divekar <dkiran@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Stone Piao 2012-09-25 20:23:38 -07:00 • committed by John W. Linville
parent eab1c76bfc
commit ea021f5600
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/net/wireless/mwifiex/cfg80211.c
View file

@ -1704,8 +1704,9 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy,
{ {
struct net_device *dev = request->wdev->netdev; struct net_device *dev = request->wdev->netdev;
struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
int i; int i, offset;
struct ieee80211_channel *chan; struct ieee80211_channel *chan;
struct ieee_types_header *ie;
wiphy_dbg(wiphy, "info: received scan request on %s\n", dev->name); wiphy_dbg(wiphy, "info: received scan request on %s\n", dev->name);
@ -1728,13 +1729,17 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy,
priv->user_scan_cfg->ssid_list = request->ssids; priv->user_scan_cfg->ssid_list = request->ssids;
if (request->ie && request->ie_len) { if (request->ie && request->ie_len) {
offset = 0;
for (i = 0; i < MWIFIEX_MAX_VSIE_NUM; i++) { for (i = 0; i < MWIFIEX_MAX_VSIE_NUM; i++) {
if (priv->vs_ie[i].mask != MWIFIEX_VSIE_MASK_CLEAR) if (priv->vs_ie[i].mask != MWIFIEX_VSIE_MASK_CLEAR)
continue; continue;
priv->vs_ie[i].mask = MWIFIEX_VSIE_MASK_SCAN; priv->vs_ie[i].mask = MWIFIEX_VSIE_MASK_SCAN;
memcpy(&priv->vs_ie[i].ie, request->ie, ie = (struct ieee_types_header *)(request->ie + offset);
request->ie_len); memcpy(&priv->vs_ie[i].ie, ie, sizeof(*ie) + ie->len);
break; offset += sizeof(*ie) + ie->len;
if (offset >= request->ie_len)
break;
} }
} }