Commit dd5ecfea authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: support VHT capability overrides 



Support the cfg80211 API to override VHT capabilities
on association.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent ee2aca34

net/mac80211/ieee80211_i.h

+4 −0
Original line number Diff line number Diff line
@@ -479,6 +479,8 @@ struct ieee80211_if_managed { 


	struct ieee80211_ht_cap ht_capa; /* configured ht-cap over-rides */

	struct ieee80211_ht_cap ht_capa_mask; /* Valid parts of ht_capa */

	struct ieee80211_vht_cap vht_capa; /* configured VHT overrides */

	struct ieee80211_vht_cap vht_capa_mask; /* Valid parts of vht_capa */

};



struct ieee80211_if_ibss {
@@ -1441,6 +1443,8 @@ void ieee80211_sta_set_rx_nss(struct sta_info *sta); 
void ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata,

				 struct sta_info *sta, u8 opmode,

				 enum ieee80211_band band, bool nss_only);

void ieee80211_apply_vhtcap_overrides(struct ieee80211_sub_if_data *sdata,

				      struct ieee80211_sta_vht_cap *vht_cap);



/* Spectrum management */

void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,

net/mac80211/main.c

+22 −0
Original line number Diff line number Diff line
@@ -501,6 +501,27 @@ static const struct ieee80211_ht_cap mac80211_ht_capa_mod_mask = { 
	},

};



static const struct ieee80211_vht_cap mac80211_vht_capa_mod_mask = {

	.vht_cap_info =

		cpu_to_le32(IEEE80211_VHT_CAP_RXLDPC |

			    IEEE80211_VHT_CAP_SHORT_GI_80 |

			    IEEE80211_VHT_CAP_SHORT_GI_160 |

			    IEEE80211_VHT_CAP_RXSTBC_1 |

			    IEEE80211_VHT_CAP_RXSTBC_2 |

			    IEEE80211_VHT_CAP_RXSTBC_3 |

			    IEEE80211_VHT_CAP_RXSTBC_4 |

			    IEEE80211_VHT_CAP_TXSTBC |

			    IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |

			    IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |

			    IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN |

			    IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |

			    IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK),

	.supp_mcs = {

		.rx_mcs_map = cpu_to_le16(~0),

		.tx_mcs_map = cpu_to_le16(~0),

	},

};



static const u8 extended_capabilities[] = {

	0, 0, 0, 0, 0, 0, 0,

	WLAN_EXT_CAPA8_OPMODE_NOTIF,
@@ -609,6 +630,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, 
					 IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH;

	local->user_power_level = IEEE80211_UNSET_POWER_LEVEL;

	wiphy->ht_capa_mod_mask = &mac80211_ht_capa_mod_mask;

	wiphy->vht_capa_mod_mask = &mac80211_vht_capa_mod_mask;



	INIT_LIST_HEAD(&local->interfaces);

net/mac80211/mlme.c

+11 −1
Original line number Diff line number Diff line
@@ -609,6 +609,7 @@ static void ieee80211_add_vht_ie(struct ieee80211_sub_if_data *sdata, 
	BUILD_BUG_ON(sizeof(vht_cap) != sizeof(sband->vht_cap));



	memcpy(&vht_cap, &sband->vht_cap, sizeof(vht_cap));

	ieee80211_apply_vhtcap_overrides(sdata, &vht_cap);



	/* determine capability flags */

	cap = vht_cap.cap;
@@ -1802,9 +1803,11 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, 
	sdata->vif.bss_conf.p2p_ctwindow = 0;

	sdata->vif.bss_conf.p2p_oppps = false;



	/* on the next assoc, re-program HT parameters */

	/* on the next assoc, re-program HT/VHT parameters */

	memset(&ifmgd->ht_capa, 0, sizeof(ifmgd->ht_capa));

	memset(&ifmgd->ht_capa_mask, 0, sizeof(ifmgd->ht_capa_mask));

	memset(&ifmgd->vht_capa, 0, sizeof(ifmgd->vht_capa));

	memset(&ifmgd->vht_capa_mask, 0, sizeof(ifmgd->vht_capa_mask));



	sdata->ap_power_level = IEEE80211_UNSET_POWER_LEVEL;
@@ -4071,6 +4074,9 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 
		ifmgd->flags |= IEEE80211_STA_DISABLE_VHT;

	}



	if (req->flags & ASSOC_REQ_DISABLE_VHT)

		ifmgd->flags |= IEEE80211_STA_DISABLE_VHT;



	/* Also disable HT if we don't support it or the AP doesn't use WMM */

	sband = local->hw.wiphy->bands[req->bss->channel->band];

	if (!sband->ht_cap.ht_supported ||
@@ -4094,6 +4100,10 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 
	memcpy(&ifmgd->ht_capa_mask, &req->ht_capa_mask,

	       sizeof(ifmgd->ht_capa_mask));



	memcpy(&ifmgd->vht_capa, &req->vht_capa, sizeof(ifmgd->vht_capa));

	memcpy(&ifmgd->vht_capa_mask, &req->vht_capa_mask,

	       sizeof(ifmgd->vht_capa_mask));



	if (req->ie && req->ie_len) {

		memcpy(assoc_data->ie, req->ie, req->ie_len);

		assoc_data->ie_len = req->ie_len;

net/mac80211/vht.c

+98 −0
Original line number Diff line number Diff line
@@ -13,6 +13,104 @@ 
#include "rate.h"





static void __check_vhtcap_disable(struct ieee80211_sub_if_data *sdata,

				   struct ieee80211_sta_vht_cap *vht_cap,

				   u32 flag)

{

	__le32 le_flag = cpu_to_le32(flag);



	if (sdata->u.mgd.vht_capa_mask.vht_cap_info & le_flag &&

	    !(sdata->u.mgd.vht_capa.vht_cap_info & le_flag))

		vht_cap->cap &= ~flag;

}



void ieee80211_apply_vhtcap_overrides(struct ieee80211_sub_if_data *sdata,

				      struct ieee80211_sta_vht_cap *vht_cap)

{

	int i;

	u16 rxmcs_mask, rxmcs_cap, rxmcs_n, txmcs_mask, txmcs_cap, txmcs_n;



	if (!vht_cap->vht_supported)

		return;



	if (sdata->vif.type != NL80211_IFTYPE_STATION)

		return;



	__check_vhtcap_disable(sdata, vht_cap,

			       IEEE80211_VHT_CAP_RXLDPC);

	__check_vhtcap_disable(sdata, vht_cap,

			       IEEE80211_VHT_CAP_SHORT_GI_80);

	__check_vhtcap_disable(sdata, vht_cap,

			       IEEE80211_VHT_CAP_SHORT_GI_160);

	__check_vhtcap_disable(sdata, vht_cap,

			       IEEE80211_VHT_CAP_TXSTBC);

	__check_vhtcap_disable(sdata, vht_cap,

			       IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE);

	__check_vhtcap_disable(sdata, vht_cap,

			       IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE);

	__check_vhtcap_disable(sdata, vht_cap,

			       IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN);

	__check_vhtcap_disable(sdata, vht_cap,

			       IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN);



	/* Allow user to decrease AMPDU length exponent */

	if (sdata->u.mgd.vht_capa_mask.vht_cap_info &

	    cpu_to_le32(IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK)) {

		u32 cap, n;



		n = le32_to_cpu(sdata->u.mgd.vht_capa.vht_cap_info) &

			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;

		n >>= IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;

		cap = vht_cap->cap & IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;

		cap >>= IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;



		if (n < cap) {

			vht_cap->cap &=

				~IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;

			vht_cap->cap |=

				n << IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;

		}

	}



	/* Allow the user to decrease MCSes */

	rxmcs_mask =

		le16_to_cpu(sdata->u.mgd.vht_capa_mask.supp_mcs.rx_mcs_map);

	rxmcs_n = le16_to_cpu(sdata->u.mgd.vht_capa.supp_mcs.rx_mcs_map);

	rxmcs_n &= rxmcs_mask;

	rxmcs_cap = le16_to_cpu(vht_cap->vht_mcs.rx_mcs_map);



	txmcs_mask =

		le16_to_cpu(sdata->u.mgd.vht_capa_mask.supp_mcs.tx_mcs_map);

	txmcs_n = le16_to_cpu(sdata->u.mgd.vht_capa.supp_mcs.tx_mcs_map);

	txmcs_n &= txmcs_mask;

	txmcs_cap = le16_to_cpu(vht_cap->vht_mcs.tx_mcs_map);

	for (i = 0; i < 8; i++) {

		u8 m, n, c;



		m = (rxmcs_mask >> 2*i) & IEEE80211_VHT_MCS_NOT_SUPPORTED;

		n = (rxmcs_n >> 2*i) & IEEE80211_VHT_MCS_NOT_SUPPORTED;

		c = (rxmcs_cap >> 2*i) & IEEE80211_VHT_MCS_NOT_SUPPORTED;



		if (m && ((c != IEEE80211_VHT_MCS_NOT_SUPPORTED && n < c) ||

			  n == IEEE80211_VHT_MCS_NOT_SUPPORTED)) {

			rxmcs_cap &= ~(3 << 2*i);

			rxmcs_cap |= (rxmcs_n & (3 << 2*i));

		}



		m = (txmcs_mask >> 2*i) & IEEE80211_VHT_MCS_NOT_SUPPORTED;

		n = (txmcs_n >> 2*i) & IEEE80211_VHT_MCS_NOT_SUPPORTED;

		c = (txmcs_cap >> 2*i) & IEEE80211_VHT_MCS_NOT_SUPPORTED;



		if (m && ((c != IEEE80211_VHT_MCS_NOT_SUPPORTED && n < c) ||

			  n == IEEE80211_VHT_MCS_NOT_SUPPORTED)) {

			txmcs_cap &= ~(3 << 2*i);

			txmcs_cap |= (txmcs_n & (3 << 2*i));

		}

	}

	vht_cap->vht_mcs.rx_mcs_map = cpu_to_le16(rxmcs_cap);

	vht_cap->vht_mcs.tx_mcs_map = cpu_to_le16(txmcs_cap);

}



void

ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata,

				    struct ieee80211_supported_band *sband,