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

Commit 1c45c5ce authored by Eliad Peller's avatar Eliad Peller Committed by Johannes Berg
Browse files

mac80211: update sta bw on ht chanwidth action frame 



Commit e1a0c6b3 ("mac80211: stop toggling IEEE80211_HT_CAP_SUP_WIDTH_20_40")
mistakenly removed the actual update of sta->sta.bandwidth.

Refactor ieee80211_sta_cur_vht_bw() into multiple functions
(calculate caps-bw and chandef-bw separately, and min them
with cur_max_bandwidth).

On ht chanwidth action frame set only cur_max_bandwidth
(according to the sta capabilities) and recalc the sta bw.

Signed-off-by: default avatarEliad Peller <eliadx.peller@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a5fee9cb

net/mac80211/ieee80211_i.h

+1 −0
Original line number Diff line number Diff line
@@ -1704,6 +1704,7 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, 
				    struct ieee80211_supported_band *sband,

				    const struct ieee80211_vht_cap *vht_cap_ie,

				    struct sta_info *sta);

enum ieee80211_sta_rx_bandwidth ieee80211_sta_cap_rx_bw(struct sta_info *sta);

enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta);

void ieee80211_sta_set_rx_nss(struct sta_info *sta);

u32 __ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata,

net/mac80211/rx.c

+8 −3
Original line number Diff line number Diff line
@@ -2597,7 +2597,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) 
		case WLAN_HT_ACTION_NOTIFY_CHANWIDTH: {

			struct ieee80211_supported_band *sband;

			u8 chanwidth = mgmt->u.action.u.ht_notify_cw.chanwidth;

			enum ieee80211_sta_rx_bandwidth new_bw;

			enum ieee80211_sta_rx_bandwidth max_bw, new_bw;



			/* If it doesn't support 40 MHz it can't change ... */

			if (!(rx->sta->sta.ht_cap.cap &
@@ -2605,13 +2605,18 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) 
				goto handled;



			if (chanwidth == IEEE80211_HT_CHANWIDTH_20MHZ)

				new_bw = IEEE80211_STA_RX_BW_20;

				max_bw = IEEE80211_STA_RX_BW_20;

			else

				max_bw = ieee80211_sta_cap_rx_bw(rx->sta);



			/* set cur_max_bandwidth and recalc sta bw */

			rx->sta->cur_max_bandwidth = max_bw;

			new_bw = ieee80211_sta_cur_vht_bw(rx->sta);



			if (rx->sta->sta.bandwidth == new_bw)

				goto handled;



			rx->sta->sta.bandwidth = new_bw;

			sband = rx->local->hw.wiphy->bands[status->band];



			rate_control_rate_update(local, sband, rx->sta,

net/mac80211/vht.c

+38 −35
Original line number Diff line number Diff line
@@ -269,51 +269,54 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, 
	sta->sta.bandwidth = ieee80211_sta_cur_vht_bw(sta);

}



enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta)

enum ieee80211_sta_rx_bandwidth ieee80211_sta_cap_rx_bw(struct sta_info *sta)

{

	struct ieee80211_sub_if_data *sdata = sta->sdata;

	u32 cap = sta->sta.vht_cap.cap;

	enum ieee80211_sta_rx_bandwidth bw;

	struct ieee80211_sta_vht_cap *vht_cap = &sta->sta.vht_cap;

	u32 cap_width;



	if (!vht_cap->vht_supported)

		return sta->sta.ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 ?

				IEEE80211_STA_RX_BW_40 :

				IEEE80211_STA_RX_BW_20;



	cap_width = vht_cap->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK;



	if (!sta->sta.vht_cap.vht_supported) {

		bw = sta->sta.ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 ?

				IEEE80211_STA_RX_BW_40 : IEEE80211_STA_RX_BW_20;

		goto check_max;

	if (cap_width == IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ ||

	    cap_width == IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ)

		return IEEE80211_STA_RX_BW_160;



	return IEEE80211_STA_RX_BW_80;

}



	switch (sdata->vif.bss_conf.chandef.width) {

	default:

		WARN_ON_ONCE(1);

		/* fall through */

static enum ieee80211_sta_rx_bandwidth

ieee80211_chan_width_to_rx_bw(enum nl80211_chan_width width)

{

	switch (width) {

	case NL80211_CHAN_WIDTH_20_NOHT:

	case NL80211_CHAN_WIDTH_20:

		bw = IEEE80211_STA_RX_BW_20;

		break;

		return IEEE80211_STA_RX_BW_20;

	case NL80211_CHAN_WIDTH_40:

		bw = sta->sta.ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 ?

				IEEE80211_STA_RX_BW_40 : IEEE80211_STA_RX_BW_20;

		break;

		return IEEE80211_STA_RX_BW_40;

	case NL80211_CHAN_WIDTH_80:

		return IEEE80211_STA_RX_BW_80;

	case NL80211_CHAN_WIDTH_160:

		if ((cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) ==

				IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ) {

			bw = IEEE80211_STA_RX_BW_160;

			break;

		}

		/* fall through */

	case NL80211_CHAN_WIDTH_80P80:

		if ((cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) ==

				IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ) {

			bw = IEEE80211_STA_RX_BW_160;

			break;

		return IEEE80211_STA_RX_BW_160;

	default:

		WARN_ON_ONCE(1);

		return IEEE80211_STA_RX_BW_20;

	}

		/* fall through */

	case NL80211_CHAN_WIDTH_80:

		bw = IEEE80211_STA_RX_BW_80;

}



 check_max:

	if (bw > sta->cur_max_bandwidth)

		bw = sta->cur_max_bandwidth;

enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta)

{

	struct ieee80211_sub_if_data *sdata = sta->sdata;

	enum ieee80211_sta_rx_bandwidth bw;



	bw = ieee80211_chan_width_to_rx_bw(sdata->vif.bss_conf.chandef.width);

	bw = min(bw, ieee80211_sta_cap_rx_bw(sta));

	bw = min(bw, sta->cur_max_bandwidth);



	return bw;

}