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

Commit 487882d9 authored by Felix Fietkau's avatar Felix Fietkau Committed by Greg Kroah-Hartman
Browse files

mac80211: do not allow bigger VHT MPDUs than the hardware supports 



[ Upstream commit 3bd5c7a28a7c3aba07a2d300d43f8e988809e147 ]

Limit maximum VHT MPDU size by local capability.

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20200917125031.45009-1-nbd@nbd.name


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7fcf25b4

net/mac80211/vht.c

+4 −4
Original line number Diff line number Diff line
@@ -170,10 +170,7 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, 
	/* take some capabilities as-is */

	cap_info = le32_to_cpu(vht_cap_ie->vht_cap_info);

	vht_cap->cap = cap_info;

	vht_cap->cap &= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 |

			IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |

			IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |

			IEEE80211_VHT_CAP_RXLDPC |

	vht_cap->cap &= IEEE80211_VHT_CAP_RXLDPC |

			IEEE80211_VHT_CAP_VHT_TXOP_PS |

			IEEE80211_VHT_CAP_HTC_VHT |

			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |
@@ -182,6 +179,9 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, 
			IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |

			IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN;



	vht_cap->cap |= min_t(u32, cap_info & IEEE80211_VHT_CAP_MAX_MPDU_MASK,

			      own_cap.cap & IEEE80211_VHT_CAP_MAX_MPDU_MASK);



	/* and some based on our own capabilities */

	switch (own_cap.cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) {

	case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ: