Commit 018f6fbf authored by Denis Kenzior's avatar Denis Kenzior Committed by Johannes Berg
Browse files

mac80211: Send control port frames over nl80211 



If userspace requested control port frames to go over 80211, then do so.
The control packets are intercepted just prior to delivery of the packet
to the underlying network device.

Pre-authentication type frames (protocol: 0x88c7) are also forwarded
over nl80211.

Signed-off-by: default avatarDenis Kenzior <denkenz@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 91180649

net/mac80211/cfg.c

+6 −0
Original line number Diff line number Diff line
@@ -926,6 +926,8 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, 
	 */

	sdata->control_port_protocol = params->crypto.control_port_ethertype;

	sdata->control_port_no_encrypt = params->crypto.control_port_no_encrypt;

	sdata->control_port_over_nl80211 =

				params->crypto.control_port_over_nl80211;

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

							&params->crypto,

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

		vlan->control_port_no_encrypt =

			params->crypto.control_port_no_encrypt;

		vlan->control_port_over_nl80211 =

			params->crypto.control_port_over_nl80211;

		vlan->encrypt_headroom =

			ieee80211_cs_headroom(sdata->local,

					      &params->crypto,
@@ -2020,6 +2024,8 @@ static int ieee80211_join_mesh(struct wiphy *wiphy, struct net_device *dev, 
	if (err)

		return err;



	sdata->control_port_over_nl80211 = setup->control_port_over_nl80211;



	/* can mesh use other SMPS modes? */

	sdata->smps_mode = IEEE80211_SMPS_OFF;

	sdata->needed_rx_chains = sdata->local->rx_chains;

net/mac80211/ibss.c

+1 −0
Original line number Diff line number Diff line
@@ -1844,6 +1844,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, 


	sdata->smps_mode = IEEE80211_SMPS_OFF;

	sdata->needed_rx_chains = local->rx_chains;

	sdata->control_port_over_nl80211 = params->control_port_over_nl80211;



	ieee80211_queue_work(&local->hw, &sdata->work);

net/mac80211/ieee80211_i.h

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

	__be16 control_port_protocol;

	bool control_port_no_encrypt;

	bool control_port_over_nl80211;

	int encrypt_headroom;



	atomic_t num_tx_queued;

net/mac80211/iface.c

+2 −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_protocol;

		sdata->control_port_no_encrypt =

			master->control_port_no_encrypt;

		sdata->control_port_over_nl80211 =

			master->control_port_over_nl80211;

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

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

		       sizeof(sdata->vif.hw_queue));

net/mac80211/main.c

+2 −0
Original line number Diff line number Diff line
@@ -554,6 +554,8 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, 
			   NL80211_FEATURE_USERSPACE_MPM |

			   NL80211_FEATURE_FULL_AP_CLIENT_STATE;

	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_STA);

	wiphy_ext_feature_set(wiphy,

			      NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211);



	if (!ops->hw_scan)

		wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN |

CRA Git | Maintained and supported by SUSTech CRA and CCSE