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

Commit 1b3a2e49 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: handle extended channel switch announcement 



Handle the (public) extended channel switch announcement
action frames. Parts of the data in these frames isn't
really in IEs, but put it into the elems struct anyway
to simplify the handling.

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

include/linux/ieee80211.h

+6 −0
Original line number Diff line number Diff line
@@ -864,6 +864,11 @@ struct ieee80211_mgmt { 
					u8 action_code;

					u8 variable[0];

				} __packed chan_switch;

				struct{

					u8 action_code;

					struct ieee80211_ext_chansw_ie data;

					u8 variable[0];

				} __packed ext_chan_switch;

				struct{

					u8 action_code;

					u8 dialog_token;
@@ -1816,6 +1821,7 @@ enum ieee80211_key_len { 


/* Public action codes */

enum ieee80211_pub_actioncode {

	WLAN_PUB_ACTION_EXT_CHANSW_ANN = 4,

	WLAN_PUB_ACTION_TDLS_DISCOVER_RES = 14,

};

net/mac80211/mlme.c

+27 −4
Original line number Diff line number Diff line
@@ -3100,6 +3100,8 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, 
	enum rx_mgmt_action rma = RX_MGMT_NONE;

	u8 deauth_buf[IEEE80211_DEAUTH_FRAME_LEN];

	u16 fc;

	struct ieee802_11_elems elems;

	int ies_len;



	rx_status = (struct ieee80211_rx_status *) skb->cb;

	mgmt = (struct ieee80211_mgmt *) skb->data;
@@ -3130,8 +3132,7 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, 
		break;

	case IEEE80211_STYPE_ACTION:

		if (mgmt->u.action.category == WLAN_CATEGORY_SPECTRUM_MGMT) {

			struct ieee802_11_elems elems;

			int ies_len = skb->len -

			ies_len = skb->len -

				  offsetof(struct ieee80211_mgmt,

					   u.action.u.chan_switch.variable);
@@ -3145,6 +3146,28 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, 
			if (elems.parse_error)

				break;



			ieee80211_sta_process_chanswitch(sdata,

							 rx_status->mactime,

							 &elems);

		} else if (mgmt->u.action.category == WLAN_CATEGORY_PUBLIC) {

			ies_len = skb->len -

				  offsetof(struct ieee80211_mgmt,

					   u.action.u.ext_chan_switch.variable);



			if (ies_len < 0)

				break;



			ieee802_11_parse_elems(

				mgmt->u.action.u.ext_chan_switch.variable,

				ies_len, &elems);



			if (elems.parse_error)

				break;



			/* for the handling code pretend this was also an IE */

			elems.ext_chansw_ie =

				&mgmt->u.action.u.ext_chan_switch.data;



			ieee80211_sta_process_chanswitch(sdata,

							 rx_status->mactime,

							 &elems);

net/mac80211/rx.c

+16 −0
Original line number Diff line number Diff line
@@ -2424,6 +2424,22 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) 
		}



		break;

	case WLAN_CATEGORY_PUBLIC:

		if (len < IEEE80211_MIN_ACTION_SIZE + 1)

			goto invalid;

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

			break;

		if (!rx->sta)

			break;

		if (!ether_addr_equal(mgmt->bssid, sdata->u.mgd.bssid))

			break;

		if (mgmt->u.action.u.ext_chan_switch.action_code !=

				WLAN_PUB_ACTION_EXT_CHANSW_ANN)

			break;

		if (len < offsetof(struct ieee80211_mgmt,

				   u.action.u.ext_chan_switch.variable))

			goto invalid;

		goto queue;

	case WLAN_CATEGORY_VHT:

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

		    sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&