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

Commit eedf15d3 authored by Yogesh Ashok Powar's avatar Yogesh Ashok Powar Committed by John W. Linville
Browse files

mwifiex: use existing helper function mwifiex_fill_cap_info 



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: default avatarYogesh Ashok Powar <yogeshp@marvell.com>

Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 33f38d42

drivers/net/wireless/mwifiex/join.c

+33 −48
Original line number Diff line number Diff line
@@ -724,8 +724,8 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv, 
	u32 cmd_append_size = 0;

	u32 i;

	u16 tmp_cap;

	uint16_t ht_cap_info;

	struct mwifiex_ie_types_chan_list_param_set *chan_tlv;

	u8 radio_type;



	struct mwifiex_ie_types_htcap *ht_cap;

	struct mwifiex_ie_types_htinfo *ht_info;
@@ -914,45 +914,31 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv, 
	}



	if (adapter->adhoc_11n_enabled) {

		{

		/* Fill HT CAPABILITY */

		ht_cap = (struct mwifiex_ie_types_htcap *) pos;

			memset(ht_cap, 0,

			       sizeof(struct mwifiex_ie_types_htcap));

			ht_cap->header.type =

				cpu_to_le16(WLAN_EID_HT_CAPABILITY);

		memset(ht_cap, 0, sizeof(struct mwifiex_ie_types_htcap));

		ht_cap->header.type = cpu_to_le16(WLAN_EID_HT_CAPABILITY);

		ht_cap->header.len =

		       cpu_to_le16(sizeof(struct ieee80211_ht_cap));

		radio_type = mwifiex_band_to_radio_type(

					priv->adapter->config_bands);

		mwifiex_fill_cap_info(priv, radio_type, ht_cap);



			ht_cap_info = IEEE80211_HT_CAP_SGI_20;

			if (adapter->chan_offset) {

				ht_cap_info |= IEEE80211_HT_CAP_SGI_40;

				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

					= IEEE80211_HT_MAX_AMPDU_64K;

			ht_cap->ht_cap.mcs.rx_mask[0] = 0xff;

		pos += sizeof(struct mwifiex_ie_types_htcap);

		cmd_append_size +=

			sizeof(struct mwifiex_ie_types_htcap);

		}

		{



		/* Fill HT INFORMATION */

		ht_info = (struct mwifiex_ie_types_htinfo *) pos;

			memset(ht_info, 0,

			       sizeof(struct mwifiex_ie_types_htinfo));

			ht_info->header.type =

				cpu_to_le16(WLAN_EID_HT_INFORMATION);

		memset(ht_info, 0, sizeof(struct mwifiex_ie_types_htinfo));

		ht_info->header.type = 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;

			(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 = adapter->chan_offset;

			ht_info->ht_info.ht_param |=

					IEEE80211_HT_PARAM_CHAN_WIDTH_ANY;

		}
@@ -963,7 +949,6 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv, 
		cmd_append_size +=

			sizeof(struct mwifiex_ie_types_htinfo);

	}

	}



	cmd->size = cpu_to_le16((u16)

			    (sizeof(struct host_cmd_ds_802_11_ad_hoc_start)