leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mwifiex: use existing helper function mwifiex_fill_cap_info

Browse Source 
Use existing helper function mwifiex_fill_cap_info to fill
the HT CAP info for ibss beacons.

Also removing extra parenthesis block for better readability.

Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>

Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Yogesh Ashok Powar 2011-11-07 21:41:07 -08:00 committed by John W. Linville
parent 33f38d425f
commit eedf15d34d
1 changed files with 31 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
drivers/net/wireless/mwifiex/join.c
View File

@ -724,8 +724,8 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
u32 cmd_append_size = 0; u32 cmd_append_size = 0;
u32 i; u32 i;
u16 tmp_cap; u16 tmp_cap;
uint16_t ht_cap_info;
struct mwifiex_ie_types_chan_list_param_set *chan_tlv; struct mwifiex_ie_types_chan_list_param_set *chan_tlv;
u8 radio_type;
struct mwifiex_ie_types_htcap *ht_cap; struct mwifiex_ie_types_htcap *ht_cap;
struct mwifiex_ie_types_htinfo *ht_info; struct mwifiex_ie_types_htinfo *ht_info;
@ -914,55 +914,40 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
} }
if (adapter->adhoc_11n_enabled) { if (adapter->adhoc_11n_enabled) {
{ /* Fill HT CAPABILITY */
ht_cap = (struct mwifiex_ie_types_htcap *) pos; ht_cap = (struct mwifiex_ie_types_htcap *) pos;
memset(ht_cap, 0, memset(ht_cap, 0, sizeof(struct mwifiex_ie_types_htcap));
sizeof(struct mwifiex_ie_types_htcap)); ht_cap->header.type = cpu_to_le16(WLAN_EID_HT_CAPABILITY);
ht_cap->header.type = ht_cap->header.len =
cpu_to_le16(WLAN_EID_HT_CAPABILITY); cpu_to_le16(sizeof(struct ieee80211_ht_cap));
ht_cap->header.len = radio_type = mwifiex_band_to_radio_type(
cpu_to_le16(sizeof(struct ieee80211_ht_cap)); priv->adapter->config_bands);
mwifiex_fill_cap_info(priv, radio_type, ht_cap);
ht_cap_info = IEEE80211_HT_CAP_SGI_20; pos += sizeof(struct mwifiex_ie_types_htcap);
if (adapter->chan_offset) { cmd_append_size +=
ht_cap_info |= IEEE80211_HT_CAP_SGI_40; sizeof(struct mwifiex_ie_types_htcap);
ht_cap_info |= IEEE80211_HT_CAP_DSSSCCK40;
ht_cap_info |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
SETHT_MCS32(ht_cap->ht_cap.mcs.rx_mask);
}
ht_cap->ht_cap.cap_info = cpu_to_le16(ht_cap_info);
ht_cap->ht_cap.ampdu_params_info /* Fill HT INFORMATION */
= IEEE80211_HT_MAX_AMPDU_64K; ht_info = (struct mwifiex_ie_types_htinfo *) pos;
ht_cap->ht_cap.mcs.rx_mask[0] = 0xff; memset(ht_info, 0, sizeof(struct mwifiex_ie_types_htinfo));
pos += sizeof(struct mwifiex_ie_types_htcap); ht_info->header.type = cpu_to_le16(WLAN_EID_HT_INFORMATION);
cmd_append_size += ht_info->header.len =
sizeof(struct mwifiex_ie_types_htcap); cpu_to_le16(sizeof(struct ieee80211_ht_info));
}
{ ht_info->ht_info.control_chan =
ht_info = (struct mwifiex_ie_types_htinfo *) pos; (u8) priv->curr_bss_params.bss_descriptor.channel;
memset(ht_info, 0, if (adapter->chan_offset) {
sizeof(struct mwifiex_ie_types_htinfo)); ht_info->ht_info.ht_param = adapter->chan_offset;
ht_info->header.type = ht_info->ht_info.ht_param |=
cpu_to_le16(WLAN_EID_HT_INFORMATION);
ht_info->header.len =
cpu_to_le16(sizeof(struct ieee80211_ht_info));
ht_info->ht_info.control_chan =
(u8) priv->curr_bss_params.bss_descriptor.
channel;
if (adapter->chan_offset) {
ht_info->ht_info.ht_param =
adapter->chan_offset;
ht_info->ht_info.ht_param |=
IEEE80211_HT_PARAM_CHAN_WIDTH_ANY; IEEE80211_HT_PARAM_CHAN_WIDTH_ANY;
}
ht_info->ht_info.operation_mode =
cpu_to_le16(IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
ht_info->ht_info.basic_set[0] = 0xff;
pos += sizeof(struct mwifiex_ie_types_htinfo);
cmd_append_size +=
sizeof(struct mwifiex_ie_types_htinfo);
} }
ht_info->ht_info.operation_mode =
cpu_to_le16(IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
ht_info->ht_info.basic_set[0] = 0xff;
pos += sizeof(struct mwifiex_ie_types_htinfo);
cmd_append_size +=
sizeof(struct mwifiex_ie_types_htinfo);
} }
cmd->size = cpu_to_le16((u16) cmd->size = cpu_to_le16((u16)