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

Commit 5eb7906b authored Aug 29, 2013 by Eliad Peller Committed by Johannes Berg Oct 01, 2013

ieee80211: fix vht cap definitions



VHT_CAP_BEAMFORMER_ANTENNAS cap is actually defined in the draft as
VHT_CAP_BEAMFORMEE_STS_MAX, and its size is 3 bits long.

VHT_CAP_SOUNDING_DIMENSIONS is also 3 bits long.

Fix the definitions and change the cap masking accordingly.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent f364ef99

include/linux/ieee80211.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1391,8 +1391,8 @@ struct ieee80211_vht_operation {
	#define IEEE80211_VHT_CAP_RXSTBC_MASK 0x00000700		#define IEEE80211_VHT_CAP_RXSTBC_MASK 0x00000700
	#define IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE 0x00000800		#define IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE 0x00000800
	#define IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE 0x00001000		#define IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE 0x00001000
	#define IEEE80211_VHT_CAP_BEAMFORMER_ANTENNAS_MAX 0x00006000		#define IEEE80211_VHT_CAP_BEAMFORMEE_STS_MAX 0x0000e000
	#define IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MAX 0x00030000		#define IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MAX 0x00070000
	#define IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE 0x00080000		#define IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE 0x00080000
	#define IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE 0x00100000		#define IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE 0x00100000
	#define IEEE80211_VHT_CAP_VHT_TXOP_PS 0x00200000		#define IEEE80211_VHT_CAP_VHT_TXOP_PS 0x00200000

net/mac80211/vht.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -185,13 +185,13 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata,
	if (own_cap.cap & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE) {		if (own_cap.cap & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE) {
	vht_cap->cap \|= cap_info &		vht_cap->cap \|= cap_info &
	(IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE \|		(IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE \|
	IEEE80211_VHT_CAP_BEAMFORMER_ANTENNAS_MAX \|
	IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MAX);		IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MAX);
	}		}

	if (own_cap.cap & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE)		if (own_cap.cap & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE)
	vht_cap->cap \|= cap_info &		vht_cap->cap \|= cap_info &
	IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE;		(IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE \|
			IEEE80211_VHT_CAP_BEAMFORMEE_STS_MAX);

	if (own_cap.cap & IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE)		if (own_cap.cap & IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE)
	vht_cap->cap \|= cap_info &		vht_cap->cap \|= cap_info &