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

Commit af2f77c0 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cfg80211/nl80211: add DFS offload flag"

parents ddb7d7d5 eced5346

include/uapi/linux/nl80211.h

+7 −0
Original line number Diff line number Diff line
@@ -4927,6 +4927,12 @@ enum nl80211_feature_flags { 
 *	handshake with 802.1X in station mode (will pass EAP frames to the host

 *	and accept the set_pmk/del_pmk commands), doing it in the host might not

 *	be supported.

 * @NL80211_EXT_FEATURE_DFS_OFFLOAD: HW/driver will offload DFS actions.

 *	Device or driver will do all DFS-related actions by itself,

 *	informing user-space about CAC progress, radar detection event,

 *	channel change triggered by radar detection event.

 *	No need to start CAC from user-space, no need to react to

 *	"radar detected" event.

 *

 * @NUM_NL80211_EXT_FEATURES: number of extended features.

 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -4949,6 +4955,7 @@ enum nl80211_ext_feature_index { 
	NL80211_EXT_FEATURE_FILS_SK_OFFLOAD,

	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK,

	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X,

	NL80211_EXT_FEATURE_DFS_OFFLOAD,



	/* add new features before the definition below */

	NUM_NL80211_EXT_FEATURES,

net/wireless/nl80211.c

+8 −4
Original line number Diff line number Diff line
@@ -7457,12 +7457,13 @@ static int nl80211_start_radar_detection(struct sk_buff *skb, 
	struct cfg80211_registered_device *rdev = info->user_ptr[0];

	struct net_device *dev = info->user_ptr[1];

	struct wireless_dev *wdev = dev->ieee80211_ptr;

	struct wiphy *wiphy = wdev->wiphy;

	struct cfg80211_chan_def chandef;

	enum nl80211_dfs_regions dfs_region;

	unsigned int cac_time_ms;

	int err;



	dfs_region = reg_get_dfs_region(wdev->wiphy);

	dfs_region = reg_get_dfs_region(wiphy);

	if (dfs_region == NL80211_DFS_UNSET)

		return -EINVAL;
@@ -7476,17 +7477,20 @@ static int nl80211_start_radar_detection(struct sk_buff *skb, 
	if (wdev->cac_started)

		return -EBUSY;



	err = cfg80211_chandef_dfs_required(wdev->wiphy, &chandef,

					    wdev->iftype);

	err = cfg80211_chandef_dfs_required(wiphy, &chandef, wdev->iftype);

	if (err < 0)

		return err;



	if (err == 0)

		return -EINVAL;



	if (!cfg80211_chandef_dfs_usable(wdev->wiphy, &chandef))

	if (!cfg80211_chandef_dfs_usable(wiphy, &chandef))

		return -EINVAL;



	/* CAC start is offloaded to HW and can't be started manually */

	if (wiphy_ext_feature_isset(wiphy, NL80211_EXT_FEATURE_DFS_OFFLOAD))

		return -EOPNOTSUPP;



	if (!rdev->ops->start_radar_detection)

		return -EOPNOTSUPP;