D50923.id157294.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D50923.id157294.diff
View Options

	diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
	--- a/sys/net80211/ieee80211_node.c
	+++ b/sys/net80211/ieee80211_node.c
	@@ -940,7 +940,7 @@
	{
	struct ieee80211com *ic = vap->iv_ic;
	struct ieee80211_node *ni;
	- int do_ht = 0;
	+ bool do_ht;

	ni = ieee80211_alloc_node(&ic->ic_sta, vap, se->se_macaddr,
	__func__, __LINE__);
	@@ -1016,6 +1016,7 @@
	* association request/response, the only appropriate place
	* to setup the HT state is here.
	*/
	+ do_ht = false;
	if (ni->ni_ies.htinfo_ie != NULL &&
	ni->ni_ies.htcap_ie != NULL &&
	vap->iv_flags_ht & IEEE80211_FHT_HT) {
	@@ -1023,7 +1024,7 @@
	ieee80211_ht_updateparams(ni,
	ni->ni_ies.htcap_ie,
	ni->ni_ies.htinfo_ie);
	- do_ht = 1;
	+ do_ht = true;
	}

	/*
	@@ -1032,7 +1033,7 @@
	*
	* For now, don't allow 2GHz VHT operation.
	*/
	- if (ni->ni_ies.vhtopmode_ie != NULL &&
	+ if (do_ht && ni->ni_ies.vhtopmode_ie != NULL &&
	ni->ni_ies.vhtcap_ie != NULL &&
	vap->iv_vht_flags & IEEE80211_FVHT_VHT) {
	if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) {
	@@ -1045,7 +1046,6 @@
	ni->ni_ies.vhtcap_ie,
	ni->ni_ies.vhtopmode_ie);
	ieee80211_setup_vht_rates(ni);
	- do_ht = 1;
	}
	}