renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-26 07:35:44 +08:00
Code

mwifiex: separate function for parsing head and tail IEs

Browse Source 
Head & Tail IEs are supposed to be added to beacon and probe response.
This patch adds separate function for parsing head and tail IEs from
cfg80211_beacon_data and sets them to FW.

Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Qingshui Gao <gaoqs@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Avinash Patil 2015-01-28 15:54:20 +05:30 committed by Kalle Valo
parent b654ca182a
commit 2ade5667e2
3 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
drivers/net/wireless/mwifiex/ie.c
View File

@ -317,27 +317,26 @@ done:
return ret; return ret;
} }
/* This function parses different IEs-tail IEs, beacon IEs, probe response IEs, /* This function parses head and tail IEs, from cfg80211_beacon_data and sets
* association response IEs from cfg80211_ap_settings function and sets these IE * these IE to FW.
* to FW.
*/ */
int mwifiex_set_mgmt_ies(struct mwifiex_private *priv, static int mwifiex_uap_set_head_tail_ies(struct mwifiex_private *priv,
struct cfg80211_beacon_data *info) struct cfg80211_beacon_data *info)
{ {
struct mwifiex_ie *gen_ie; struct mwifiex_ie *gen_ie;
struct ieee_types_header *rsn_ie, *wpa_ie = NULL; struct ieee_types_header *rsn_ie = NULL, *wpa_ie = NULL;
u16 rsn_idx = MWIFIEX_AUTO_IDX_MASK, ie_len = 0; u16 gen_idx = MWIFIEX_AUTO_IDX_MASK, ie_len = 0;
const u8 *vendor_ie; const u8 *vendor_ie;
if (info->tail && info->tail_len) { gen_ie = kzalloc(sizeof(*gen_ie), GFP_KERNEL);
gen_ie = kzalloc(sizeof(struct mwifiex_ie), GFP_KERNEL); if (!gen_ie)
if (!gen_ie) return -ENOMEM;
return -ENOMEM; gen_ie->ie_index = cpu_to_le16(gen_idx);
gen_ie->ie_index = cpu_to_le16(rsn_idx); gen_ie->mgmt_subtype_mask = cpu_to_le16(MGMT_MASK_BEACON |
gen_ie->mgmt_subtype_mask = cpu_to_le16(MGMT_MASK_BEACON | MGMT_MASK_PROBE_RESP |
MGMT_MASK_PROBE_RESP | MGMT_MASK_ASSOC_RESP);
MGMT_MASK_ASSOC_RESP);
if (info->tail && info->tail_len) {
rsn_ie = (void *)cfg80211_find_ie(WLAN_EID_RSN, rsn_ie = (void *)cfg80211_find_ie(WLAN_EID_RSN,
info->tail, info->tail_len); info->tail, info->tail_len);
if (rsn_ie) { if (rsn_ie) {
@ -357,20 +356,33 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
ie_len += wpa_ie->len + 2; ie_len += wpa_ie->len + 2;
gen_ie->ie_length = cpu_to_le16(ie_len); gen_ie->ie_length = cpu_to_le16(ie_len);
} }
if (rsn_ie || wpa_ie) {
if (mwifiex_update_uap_custom_ie(priv, gen_ie, &rsn_idx,
NULL, NULL,
NULL, NULL)) {
kfree(gen_ie);
return -1;
}
priv->rsn_idx = rsn_idx;
}
kfree(gen_ie);
} }
if (rsn_ie || wpa_ie) {
if (mwifiex_update_uap_custom_ie(priv, gen_ie, &gen_idx, NULL,
NULL, NULL, NULL)) {
kfree(gen_ie);
return -1;
}
priv->gen_idx = gen_idx;
}
kfree(gen_ie);
return 0;
}
/* This function parses different IEs-head & tail IEs, beacon IEs,
* probe response IEs, association response IEs from cfg80211_ap_settings
* function and sets these IE to FW.
*/
int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
struct cfg80211_beacon_data *info)
{
int ret;
ret = mwifiex_uap_set_head_tail_ies(priv, info);
return ret;
return mwifiex_set_mgmt_beacon_data_ies(priv, info); return mwifiex_set_mgmt_beacon_data_ies(priv, info);
} }
@ -378,25 +390,25 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
int mwifiex_del_mgmt_ies(struct mwifiex_private *priv) int mwifiex_del_mgmt_ies(struct mwifiex_private *priv)
{ {
struct mwifiex_ie *beacon_ie = NULL, *pr_ie = NULL; struct mwifiex_ie *beacon_ie = NULL, *pr_ie = NULL;
struct mwifiex_ie *ar_ie = NULL, *rsn_ie = NULL; struct mwifiex_ie *ar_ie = NULL, *gen_ie = NULL;
int ret = 0; int ret = 0;
if (priv->rsn_idx != MWIFIEX_AUTO_IDX_MASK) { if (priv->gen_idx != MWIFIEX_AUTO_IDX_MASK) {
rsn_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL); gen_ie = kmalloc(sizeof(*gen_ie), GFP_KERNEL);
if (!rsn_ie) if (!gen_ie)
return -ENOMEM; return -ENOMEM;
rsn_ie->ie_index = cpu_to_le16(priv->rsn_idx); gen_ie->ie_index = cpu_to_le16(priv->gen_idx);
rsn_ie->mgmt_subtype_mask = cpu_to_le16(MWIFIEX_DELETE_MASK); gen_ie->mgmt_subtype_mask = cpu_to_le16(MWIFIEX_DELETE_MASK);
rsn_ie->ie_length = 0; gen_ie->ie_length = 0;
if (mwifiex_update_uap_custom_ie(priv, rsn_ie, &priv->rsn_idx, if (mwifiex_update_uap_custom_ie(priv, gen_ie, &priv->gen_idx,
NULL, &priv->proberesp_idx, NULL, &priv->proberesp_idx,
NULL, &priv->assocresp_idx)) { NULL, &priv->assocresp_idx)) {
ret = -1; ret = -1;
goto done; goto done;
} }
priv->rsn_idx = MWIFIEX_AUTO_IDX_MASK; priv->gen_idx = MWIFIEX_AUTO_IDX_MASK;
} }
if (priv->beacon_idx != MWIFIEX_AUTO_IDX_MASK) { if (priv->beacon_idx != MWIFIEX_AUTO_IDX_MASK) {
@ -440,7 +452,6 @@ done:
kfree(beacon_ie); kfree(beacon_ie);
kfree(pr_ie); kfree(pr_ie);
kfree(ar_ie); kfree(ar_ie);
kfree(rsn_ie);
return ret; return ret;
} }

2
drivers/net/wireless/mwifiex/main.c
View File

@ -973,7 +973,7 @@ void mwifiex_init_priv_params(struct mwifiex_private *priv,
priv->beacon_idx = MWIFIEX_AUTO_IDX_MASK; priv->beacon_idx = MWIFIEX_AUTO_IDX_MASK;
priv->proberesp_idx = MWIFIEX_AUTO_IDX_MASK; priv->proberesp_idx = MWIFIEX_AUTO_IDX_MASK;
priv->assocresp_idx = MWIFIEX_AUTO_IDX_MASK; priv->assocresp_idx = MWIFIEX_AUTO_IDX_MASK;
priv->rsn_idx = MWIFIEX_AUTO_IDX_MASK; priv->gen_idx = MWIFIEX_AUTO_IDX_MASK;
priv->num_tx_timeout = 0; priv->num_tx_timeout = 0;
ether_addr_copy(priv->curr_addr, priv->adapter->perm_addr); ether_addr_copy(priv->curr_addr, priv->adapter->perm_addr);
memcpy(dev->dev_addr, priv->curr_addr, ETH_ALEN); memcpy(dev->dev_addr, priv->curr_addr, ETH_ALEN);

2
drivers/net/wireless/mwifiex/main.h
View File

@ -567,7 +567,7 @@ struct mwifiex_private {
u16 beacon_idx; u16 beacon_idx;
u16 proberesp_idx; u16 proberesp_idx;
u16 assocresp_idx; u16 assocresp_idx;
u16 rsn_idx; u16 gen_idx;
u8 ap_11n_enabled; u8 ap_11n_enabled;
u8 ap_11ac_enabled; u8 ap_11ac_enabled;
u32 mgmt_frame_mask; u32 mgmt_frame_mask;