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

Commit 074d46d1 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

wireless: rename ht_info to ht_operation 



Since some of the HT code pre-dates 802.11n-2009
some names are wrong. The one that bothers me most
is that "HT operation" is called "HT information"
in our code and that causes confusion.

Rename "HT information" to "HT operation" and also
the control_chan field to primary_chan to match
the name used in the spec.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Acked-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f69b9c79

drivers/net/wireless/mwifiex/11n.c

+9 −8
Original line number Diff line number Diff line
@@ -350,25 +350,26 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv, 
		ret_len += sizeof(struct mwifiex_ie_types_htcap);

	}



	if (bss_desc->bcn_ht_info) {

	if (bss_desc->bcn_ht_oper) {

		if (priv->bss_mode == NL80211_IFTYPE_ADHOC) {

			ht_info = (struct mwifiex_ie_types_htinfo *) *buffer;

			memset(ht_info, 0,

			       sizeof(struct mwifiex_ie_types_htinfo));

			ht_info->header.type =

					cpu_to_le16(WLAN_EID_HT_INFORMATION);

					cpu_to_le16(WLAN_EID_HT_OPERATION);

			ht_info->header.len =

				cpu_to_le16(sizeof(struct ieee80211_ht_info));

				cpu_to_le16(

					sizeof(struct ieee80211_ht_operation));



			memcpy((u8 *) ht_info +

			       sizeof(struct mwifiex_ie_types_header),

			       (u8 *) bss_desc->bcn_ht_info +

			       (u8 *) bss_desc->bcn_ht_oper +

			       sizeof(struct ieee_types_header),

			       le16_to_cpu(ht_info->header.len));



			if (!(sband->ht_cap.cap &

					IEEE80211_HT_CAP_SUP_WIDTH_20_40))

				ht_info->ht_info.ht_param &=

				ht_info->ht_oper.ht_param &=

					~(IEEE80211_HT_PARAM_CHAN_WIDTH_ANY |

					IEEE80211_HT_PARAM_CHA_SEC_OFFSET);
@@ -385,16 +386,16 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv, 
			sizeof(struct mwifiex_ie_types_chan_list_param_set) -

			sizeof(struct mwifiex_ie_types_header));

		chan_list->chan_scan_param[0].chan_number =

			bss_desc->bcn_ht_info->control_chan;

			bss_desc->bcn_ht_oper->primary_chan;

		chan_list->chan_scan_param[0].radio_type =

			mwifiex_band_to_radio_type((u8) bss_desc->bss_band);



		if (sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 &&

		    bss_desc->bcn_ht_info->ht_param &

		    bss_desc->bcn_ht_oper->ht_param &

		    IEEE80211_HT_PARAM_CHAN_WIDTH_ANY)

			SET_SECONDARYCHAN(chan_list->chan_scan_param[0].

					  radio_type,

					  (bss_desc->bcn_ht_info->ht_param &

					  (bss_desc->bcn_ht_oper->ht_param &

					  IEEE80211_HT_PARAM_CHA_SEC_OFFSET));



		*buffer += sizeof(struct mwifiex_ie_types_chan_list_param_set);

drivers/net/wireless/mwifiex/fw.h

+1 −1
Original line number Diff line number Diff line
@@ -1045,7 +1045,7 @@ struct mwifiex_ie_types_htcap { 


struct mwifiex_ie_types_htinfo {

	struct mwifiex_ie_types_header header;

	struct ieee80211_ht_info ht_info;

	struct ieee80211_ht_operation ht_oper;

} __packed;



struct mwifiex_ie_types_2040bssco {

drivers/net/wireless/mwifiex/join.c

+7 −7
Original line number Diff line number Diff line
@@ -932,20 +932,20 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv, 
		/* 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);

		ht_info->header.type = cpu_to_le16(WLAN_EID_HT_OPERATION);

		ht_info->header.len =

				cpu_to_le16(sizeof(struct ieee80211_ht_info));

			cpu_to_le16(sizeof(struct ieee80211_ht_operation));



		ht_info->ht_info.control_chan =

		ht_info->ht_oper.primary_chan =

			(u8) priv->curr_bss_params.bss_descriptor.channel;

		if (adapter->sec_chan_offset) {

			ht_info->ht_info.ht_param = adapter->sec_chan_offset;

			ht_info->ht_info.ht_param |=

			ht_info->ht_oper.ht_param = adapter->sec_chan_offset;

			ht_info->ht_oper.ht_param |=

					IEEE80211_HT_PARAM_CHAN_WIDTH_ANY;

		}

		ht_info->ht_info.operation_mode =

		ht_info->ht_oper.operation_mode =

		     cpu_to_le16(IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);

		ht_info->ht_info.basic_set[0] = 0xff;

		ht_info->ht_oper.basic_set[0] = 0xff;

		pos += sizeof(struct mwifiex_ie_types_htinfo);

		cmd_append_size +=

				sizeof(struct mwifiex_ie_types_htinfo);

drivers/net/wireless/mwifiex/main.h

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ struct mwifiex_bssdescriptor { 
	u8  disable_11n;

	struct ieee80211_ht_cap *bcn_ht_cap;

	u16 ht_cap_offset;

	struct ieee80211_ht_info *bcn_ht_info;

	struct ieee80211_ht_operation *bcn_ht_oper;

	u16 ht_info_offset;

	u8 *bcn_bss_co_2040;

	u16 bss_co_2040_offset;

drivers/net/wireless/mwifiex/scan.c

+6 −6
Original line number Diff line number Diff line
@@ -1221,9 +1221,9 @@ mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter, 
					sizeof(struct ieee_types_header) -

					bss_entry->beacon_buf);

			break;

		case WLAN_EID_HT_INFORMATION:

			bss_entry->bcn_ht_info = (struct ieee80211_ht_info *)

					(current_ptr +

		case WLAN_EID_HT_OPERATION:

			bss_entry->bcn_ht_oper =

				(struct ieee80211_ht_operation *)(current_ptr +

					sizeof(struct ieee_types_header));

			bss_entry->ht_info_offset = (u16) (current_ptr +

					sizeof(struct ieee_types_header) -
@@ -1493,7 +1493,7 @@ mwifiex_update_curr_bss_params(struct mwifiex_private *priv, u8 *bssid, 
	priv->curr_bss_params.bss_descriptor.bcn_ht_cap = NULL;

	priv->curr_bss_params.bss_descriptor.ht_cap_offset =

		0;

	priv->curr_bss_params.bss_descriptor.bcn_ht_info = NULL;

	priv->curr_bss_params.bss_descriptor.bcn_ht_oper = NULL;

	priv->curr_bss_params.bss_descriptor.ht_info_offset =

		0;

	priv->curr_bss_params.bss_descriptor.bcn_bss_co_2040 =
@@ -2019,8 +2019,8 @@ mwifiex_save_curr_bcn(struct mwifiex_private *priv) 
			(curr_bss->beacon_buf +

			 curr_bss->ht_cap_offset);



	if (curr_bss->bcn_ht_info)

		curr_bss->bcn_ht_info = (struct ieee80211_ht_info *)

	if (curr_bss->bcn_ht_oper)

		curr_bss->bcn_ht_oper = (struct ieee80211_ht_operation *)

			(curr_bss->beacon_buf +

			 curr_bss->ht_info_offset);