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

Commit 0af83d3d authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: handle VHT operating mode notification 



Handle the operating mode notification action frame.
When the supported streams or the bandwidth change
let the driver and rate control algorithm know.

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

include/linux/ieee80211.h

+1 −0
Original line number Diff line number Diff line
@@ -1301,6 +1301,7 @@ struct ieee80211_vht_operation { 
#define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454			0x00000002

#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

#define IEEE80211_VHT_CAP_RXLDPC				0x00000010

#define IEEE80211_VHT_CAP_SHORT_GI_80				0x00000020

#define IEEE80211_VHT_CAP_SHORT_GI_160				0x00000040

include/net/mac80211.h

+3 −0
Original line number Diff line number Diff line
@@ -2118,11 +2118,14 @@ enum ieee80211_frame_release_type { 
 * @IEEE80211_RC_SUPP_RATES_CHANGED: The supported rate set of this peer

 *	changed (in IBSS mode) due to discovering more information about

 *	the peer.

 * @IEEE80211_RC_NSS_CHANGED: N_SS (number of spatial streams) was changed

 *	by the peer

 */

enum ieee80211_rate_control_changed {

	IEEE80211_RC_BW_CHANGED		= BIT(0),

	IEEE80211_RC_SMPS_CHANGED	= BIT(1),

	IEEE80211_RC_SUPP_RATES_CHANGED	= BIT(2),

	IEEE80211_RC_NSS_CHANGED	= BIT(3),

};



/**

net/mac80211/ht.c

+4 −0
Original line number Diff line number Diff line
@@ -212,6 +212,10 @@ bool ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_sub_if_data *sdata, 
		changed = true;

	sta->sta.bandwidth = bw;



	sta->cur_max_bandwidth =

		ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 ?

				IEEE80211_STA_RX_BW_40 : IEEE80211_STA_RX_BW_20;



	return changed;

}

net/mac80211/ieee80211_i.h

+3 −0
Original line number Diff line number Diff line
@@ -1433,6 +1433,9 @@ void ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, 
					 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);

void ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata,

				 struct sta_info *sta, u8 opmode,

				 enum ieee80211_band band);



/* Spectrum management */

void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,

net/mac80211/rx.c

+30 −0
Original line number Diff line number Diff line
@@ -2435,6 +2435,36 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) 
			goto invalid;

		}



		break;

	case WLAN_CATEGORY_VHT:

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

		    sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&

		    sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&

		    sdata->vif.type != NL80211_IFTYPE_AP &&

		    sdata->vif.type != NL80211_IFTYPE_ADHOC)

			break;



		/* verify action code is present */

		if (len < IEEE80211_MIN_ACTION_SIZE + 1)

			goto invalid;



		switch (mgmt->u.action.u.vht_opmode_notif.action_code) {

		case WLAN_VHT_ACTION_OPMODE_NOTIF: {

			u8 opmode;



			/* verify opmode is present */

			if (len < IEEE80211_MIN_ACTION_SIZE + 2)

				goto invalid;



			opmode = mgmt->u.action.u.vht_opmode_notif.operating_mode;



			ieee80211_vht_handle_opmode(rx->sdata, rx->sta,

						    opmode, status->band);

			goto handled;

		}

		default:

			break;

		}

		break;

	case WLAN_CATEGORY_BACK:

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