diff options
| -rw-r--r-- | net/mac80211/eht.c | 3 | ||||
| -rw-r--r-- | net/mac80211/he.c | 1 | ||||
| -rw-r--r-- | net/mac80211/ht.c | 4 | ||||
| -rw-r--r-- | net/mac80211/sta_info.c | 2 | ||||
| -rw-r--r-- | net/mac80211/sta_info.h | 2 | ||||
| -rw-r--r-- | net/mac80211/vht.c | 23 |
6 files changed, 4 insertions, 31 deletions
diff --git a/net/mac80211/eht.c b/net/mac80211/eht.c index e88f28edfd57..284b90aeb3e1 100644 --- a/net/mac80211/eht.c +++ b/net/mac80211/eht.c @@ -2,7 +2,7 @@ /* * EHT handling * - * Copyright(c) 2021-2025 Intel Corporation + * Copyright(c) 2021-2026 Intel Corporation */ #include "driver-ops.h" @@ -74,7 +74,6 @@ ieee80211_eht_cap_ie_to_sta_eht_cap(struct ieee80211_sub_if_data *sdata, eht_cap->has_eht = true; - link_sta->cur_max_bandwidth = ieee80211_sta_cap_rx_bw(link_sta); link_sta->pub->bandwidth = ieee80211_sta_cur_vht_bw(link_sta); /* diff --git a/net/mac80211/he.c b/net/mac80211/he.c index 92d9c4f095b3..19e2f359b796 100644 --- a/net/mac80211/he.c +++ b/net/mac80211/he.c @@ -159,7 +159,6 @@ _ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata, he_cap->has_he = true; - link_sta->cur_max_bandwidth = ieee80211_sta_cap_rx_bw(link_sta); link_sta->pub->bandwidth = ieee80211_sta_cur_vht_bw(link_sta); if (he_6ghz_capa) diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index 97719298e038..8f76440e9e48 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c @@ -291,10 +291,6 @@ bool ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_sub_if_data *sdata, link_sta->pub->bandwidth = bw; - link_sta->cur_max_bandwidth = - ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 ? - IEEE80211_STA_RX_BW_40 : IEEE80211_STA_RX_BW_20; - if (sta->sdata->vif.type == NL80211_IFTYPE_AP || sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN || sta->sdata->vif.type == NL80211_IFTYPE_NAN || diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 4c31ef8817ce..e08db1b0cb30 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -572,6 +572,8 @@ static int sta_info_alloc_link(struct ieee80211_local *local, link_info->rx_omi_bw_tx = IEEE80211_STA_RX_BW_MAX; link_info->rx_omi_bw_staging = IEEE80211_STA_RX_BW_MAX; + link_info->cur_max_bandwidth = IEEE80211_STA_RX_BW_MAX; + /* * Cause (a) warning(s) if IEEE80211_STA_RX_BW_MAX != 320 * or if new values are added to the enum. diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 3e5d003bd31f..05a776dba3e9 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -504,7 +504,7 @@ struct ieee80211_fragment_cache { * @status_stats.last_ack_signal: last ACK signal * @status_stats.ack_signal_filled: last ACK signal validity * @status_stats.avg_ack_signal: average ACK signal - * @cur_max_bandwidth: maximum bandwidth to use for TX to the station, + * @cur_max_bandwidth: dynamic bandwidth limit for the station, * taken from HT/VHT capabilities or VHT operating mode notification. * Invalid for NAN since that is operating on multiple bands. * @rx_omi_bw_rx: RX OMI bandwidth restriction to apply for RX diff --git a/net/mac80211/vht.c b/net/mac80211/vht.c index edce0b16dc3d..6da8a5021136 100644 --- a/net/mac80211/vht.c +++ b/net/mac80211/vht.c @@ -301,29 +301,6 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, return; } - /* finally set up the bandwidth */ - switch (vht_cap->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) { - case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ: - case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ: - link_sta->cur_max_bandwidth = IEEE80211_STA_RX_BW_160; - break; - default: - link_sta->cur_max_bandwidth = IEEE80211_STA_RX_BW_80; - - if (!(vht_cap->vht_mcs.tx_highest & - cpu_to_le16(IEEE80211_VHT_EXT_NSS_BW_CAPABLE))) - break; - - /* - * If this is non-zero, then it does support 160 MHz after all, - * in one form or the other. We don't distinguish here (or even - * above) between 160 and 80+80 yet. - */ - if (cap_info & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK) - link_sta->cur_max_bandwidth = - IEEE80211_STA_RX_BW_160; - } - link_sta->pub->bandwidth = ieee80211_sta_cur_vht_bw(link_sta); /* |