mac80211: limit the A-MSDU Tx based on peer's capabilities (506bcfa8) · Commits · 戴 / test

include/linux/ieee80211.h

+19 −0

Original line number	Diff line number	Diff line
		@@ -163,6 +163,14 @@ static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2)
		/* 30 byte 4 addr hdr, 2 byte QoS, 2304 byte MSDU, 12 byte crypt, 4 byte FCS */
		#define IEEE80211_MAX_FRAME_LEN 2352

		/* Maximal size of an A-MSDU */
		#define IEEE80211_MAX_MPDU_LEN_HT_3839 3839
		#define IEEE80211_MAX_MPDU_LEN_HT_7935 7935

		#define IEEE80211_MAX_MPDU_LEN_VHT_3895 3895
		#define IEEE80211_MAX_MPDU_LEN_VHT_7991 7991
		#define IEEE80211_MAX_MPDU_LEN_VHT_11454 11454

		#define IEEE80211_MAX_SSID_LEN 32

		#define IEEE80211_MAX_MESH_ID_LEN 32
		@@ -1505,6 +1513,7 @@ struct ieee80211_vht_operation {
		#define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 0x00000000
		#define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 0x00000001
		#define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 0x00000002
		#define IEEE80211_VHT_CAP_MAX_MPDU_MASK 0x00000003
		#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ 0x00000004
		#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ 0x00000008
		#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK 0x0000000C
		@@ -2086,6 +2095,16 @@ enum ieee80211_tdls_actioncode {
		#define WLAN_EXT_CAPA8_TDLS_WIDE_BW_ENABLED BIT(5)
		#define WLAN_EXT_CAPA8_OPMODE_NOTIF BIT(6)

		/* Defines the maximal number of MSDUs in an A-MSDU. */
		#define WLAN_EXT_CAPA8_MAX_MSDU_IN_AMSDU_LSB BIT(7)
		#define WLAN_EXT_CAPA9_MAX_MSDU_IN_AMSDU_MSB BIT(0)

		/*
		* Fine Timing Measurement Initiator - bit 71 of @WLAN_EID_EXT_CAPABILITY
		* information element
		*/
		#define WLAN_EXT_CAPA9_FTM_INITIATOR BIT(7)

		/* TDLS specific payload type in the LLC/SNAP header */
		#define WLAN_TDLS_SNAP_RFTYPE 0x2

include/net/mac80211.h

+14 −0

Original line number	Diff line number	Diff line
		@@ -1714,6 +1714,18 @@ struct ieee80211_sta_rates {
		* @tdls_initiator: indicates the STA is an initiator of the TDLS link. Only
		* valid if the STA is a TDLS peer in the first place.
		* @mfp: indicates whether the STA uses management frame protection or not.
		* @max_amsdu_subframes: indicates the maximal number of MSDUs in a single
		* A-MSDU. Taken from the Extended Capabilities element. 0 means
		* unlimited.
		* @max_amsdu_len: indicates the maximal length of an A-MSDU in bytes. This
		* field is always valid for packets with a VHT preamble. For packets
		* with a HT preamble, additional limits apply:
		* + If the skb is transmitted as part of a BA agreement, the
		* A-MSDU maximal size is min(max_amsdu_len, 4065) bytes.
		* + If the skb is not part of a BA aggreement, the A-MSDU maximal
		* size is min(max_amsdu_len, 7935) bytes.
		* Both additional HT limits must be enforced by the low level driver.
		* This is defined by the spec (IEEE 802.11-2012 section 8.3.2.2 NOTE 2).
		* @txq: per-TID data TX queues (if driver uses the TXQ abstraction)
		*/
		struct ieee80211_sta {
		@@ -1732,6 +1744,8 @@ struct ieee80211_sta {
		bool tdls;
		bool tdls_initiator;
		bool mfp;
		u8 max_amsdu_subframes;
		u16 max_amsdu_len;

		struct ieee80211_txq *txq[IEEE80211_NUM_TIDS];

net/mac80211/cfg.c

+29 −0

Original line number	Diff line number	Diff line
		@@ -1131,6 +1131,34 @@ static int sta_apply_parameters(struct ieee80211_local *local,
		sta->sta.max_sp = params->max_sp;
		}

		/* The sender might not have sent the last bit, consider it to be 0 */
		if (params->ext_capab_len >= 8) {
		u8 val = (params->ext_capab[7] &
		WLAN_EXT_CAPA8_MAX_MSDU_IN_AMSDU_LSB) >> 7;

		/* we did get all the bits, take the MSB as well */
		if (params->ext_capab_len >= 9) {
		u8 val_msb = params->ext_capab[8] &
		WLAN_EXT_CAPA9_MAX_MSDU_IN_AMSDU_MSB;
		val_msb <<= 1;
		val \|= val_msb;
		}

		switch (val) {
		case 1:
		sta->sta.max_amsdu_subframes = 32;
		break;
		case 2:
		sta->sta.max_amsdu_subframes = 16;
		break;
		case 3:
		sta->sta.max_amsdu_subframes = 8;
		break;
		default:
		sta->sta.max_amsdu_subframes = 0;
		}
		}

		/*
		* cfg80211 validates this (1-2007) and allows setting the AID
		* only when creating a new station entry
		@@ -1160,6 +1188,7 @@ static int sta_apply_parameters(struct ieee80211_local *local,
		ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
		params->ht_capa, sta);

		/* VHT can override some HT caps such as the A-MSDU max length */
		if (params->vht_capa)
		ieee80211_vht_cap_ie_to_sta_vht_cap(sdata, sband,
		params->vht_capa, sta);

net/mac80211/ht.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -230,6 +230,11 @@ bool ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_sub_if_data *sdata,
		/* set Rx highest rate */
		ht_cap.mcs.rx_highest = ht_cap_ie->mcs.rx_highest;

		if (ht_cap.cap & IEEE80211_HT_CAP_MAX_AMSDU)
		sta->sta.max_amsdu_len = IEEE80211_MAX_MPDU_LEN_HT_7935;
		else
		sta->sta.max_amsdu_len = IEEE80211_MAX_MPDU_LEN_HT_3839;

		apply:
		changed = memcmp(&sta->sta.ht_cap, &ht_cap, sizeof(ht_cap));

net/mac80211/vht.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -281,6 +281,23 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata,
		}

		sta->sta.bandwidth = ieee80211_sta_cur_vht_bw(sta);

		/* If HT IE reported 3839 bytes only, stay with that size. */
		if (sta->sta.max_amsdu_len == IEEE80211_MAX_MPDU_LEN_HT_3839)
		return;

		switch (vht_cap->cap & IEEE80211_VHT_CAP_MAX_MPDU_MASK) {
		case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454:
		sta->sta.max_amsdu_len = IEEE80211_MAX_MPDU_LEN_VHT_11454;
		break;
		case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991:
		sta->sta.max_amsdu_len = IEEE80211_MAX_MPDU_LEN_VHT_7991;
		break;
		case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895:
		default:
		sta->sta.max_amsdu_len = IEEE80211_MAX_MPDU_LEN_VHT_3895;
		break;
		}
		}

		enum ieee80211_sta_rx_bandwidth ieee80211_sta_cap_rx_bw(struct sta_info *sta)

Admin message