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

Commit c5e64d6b authored by John W. Linville's avatar John W. Linville
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

parents d2e5cb4e f9ac71bf

net/mac80211/trace.h

+2 −2
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ 


#define VIF_ENTRY	__field(enum nl80211_iftype, vif_type) __field(void *, sdata)	\

			__field(bool, p2p)						\

			__string(vif_name, sdata->dev ? sdata->dev->name : "<nodev>")

			__string(vif_name, sdata->name)

#define VIF_ASSIGN	__entry->vif_type = sdata->vif.type; __entry->sdata = sdata;	\

			__entry->p2p = sdata->vif.p2p;					\

			__assign_str(vif_name, sdata->dev ? sdata->dev->name : sdata->name)

			__assign_str(vif_name, sdata->name)

#define VIF_PR_FMT	" vif:%s(%d%s)"

#define VIF_PR_ARG	__get_str(vif_name), __entry->vif_type, __entry->p2p ? "/p2p" : ""

net/mac80211/vht.c

+6 −3
Original line number Diff line number Diff line
@@ -129,9 +129,12 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, 
	if (!vht_cap_ie || !sband->vht_cap.vht_supported)

		return;



	/* A VHT STA must support 40 MHz */

	if (!(sta->sta.ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40))

		return;

	/*

	 * A VHT STA must support 40 MHz, but if we verify that here

	 * then we break a few things - some APs (e.g. Netgear R6300v2

	 * and others based on the BCM4360 chipset) will unset this

	 * capability bit when operating in 20 MHz.

	 */



	vht_cap->vht_supported = true;