Commit 7f3f96ce authored by Markus Theil's avatar Markus Theil Committed by Johannes Berg
Browse files

mac80211: handle no-preauth flag for control port 



This patch adds support for disabling pre-auth rx over the nl80211 control
port for mac80211.

Signed-off-by: default avatarMarkus Theil <markus.theil@tu-ilmenau.de>
Link: https://lore.kernel.org/r/20200312091055.54257-3-markus.theil@tu-ilmenau.de


[fix indentation slightly, squash feature enablement]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5631d96a

include/net/cfg80211.h

+1 −0
Original line number Diff line number Diff line
@@ -924,6 +924,7 @@ struct cfg80211_crypto_settings { 
	__be16 control_port_ethertype;

	bool control_port_no_encrypt;

	bool control_port_over_nl80211;

	bool control_port_no_preauth;

	struct key_params *wep_keys;

	int wep_tx_key;

	const u8 *psk;

net/mac80211/cfg.c

+4 −0
Original line number Diff line number Diff line
@@ -1034,6 +1034,8 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, 
	sdata->control_port_no_encrypt = params->crypto.control_port_no_encrypt;

	sdata->control_port_over_nl80211 =

				params->crypto.control_port_over_nl80211;

	sdata->control_port_no_preauth =

				params->crypto.control_port_no_preauth;

	sdata->encrypt_headroom = ieee80211_cs_headroom(sdata->local,

							&params->crypto,

							sdata->vif.type);
@@ -1045,6 +1047,8 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, 
			params->crypto.control_port_no_encrypt;

		vlan->control_port_over_nl80211 =

			params->crypto.control_port_over_nl80211;

		vlan->control_port_no_preauth =

			params->crypto.control_port_no_preauth;

		vlan->encrypt_headroom =

			ieee80211_cs_headroom(sdata->local,

					      &params->crypto,

net/mac80211/ieee80211_i.h

+1 −0
Original line number Diff line number Diff line
@@ -912,6 +912,7 @@ struct ieee80211_sub_if_data { 
	u16 sequence_number;

	__be16 control_port_protocol;

	bool control_port_no_encrypt;

	bool control_port_no_preauth;

	bool control_port_over_nl80211;

	int encrypt_headroom;

net/mac80211/iface.c

+4 −0
Original line number Diff line number Diff line
@@ -519,6 +519,8 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) 
			master->control_port_no_encrypt;

		sdata->control_port_over_nl80211 =

			master->control_port_over_nl80211;

		sdata->control_port_no_preauth =

			master->control_port_no_preauth;

		sdata->vif.cab_queue = master->vif.cab_queue;

		memcpy(sdata->vif.hw_queue, master->vif.hw_queue,

		       sizeof(sdata->vif.hw_queue));
@@ -1463,6 +1465,8 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata, 


	sdata->control_port_protocol = cpu_to_be16(ETH_P_PAE);

	sdata->control_port_no_encrypt = false;

	sdata->control_port_over_nl80211 = false;

	sdata->control_port_no_preauth = false;

	sdata->encrypt_headroom = IEEE80211_ENCRYPT_HEADROOM;

	sdata->vif.bss_conf.idle = true;

	sdata->vif.bss_conf.txpower = INT_MIN; /* unset */

net/mac80211/main.c

+2 −0
Original line number Diff line number Diff line
@@ -589,6 +589,8 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, 
	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_STA);

	wiphy_ext_feature_set(wiphy,

			      NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211);

	wiphy_ext_feature_set(wiphy,

			      NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH);



	if (!ops->hw_scan) {

		wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN |

CRA Git | Maintained and supported by SUSTech CRA and CCSE