Commit a95bfb87 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Johannes Berg
Browse files

cfg80211: rename offchannel_chain structs to background_chain to avoid confusion with ETSI standard 



ETSI standard defines "Offchannel CAC" as:
"Off-Channel CAC is performed by a number of non-continuous checks
spread over a period in time. This period, which is required to
determine the presence of radar signals, is defined as the Off-Channel
CAC Time..
Minimum Off-Channel CAC Time 6 minutes and Maximum Off-Channel CAC Time
4 hours..".
mac80211 implementation refers to a dedicated hw chain used for continuous
radar monitoring. Rename offchannel_* references to background_* in
order to avoid confusion with ETSI standard.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://lore.kernel.org/r/4204cc1d648d76b44557981713231e030a3bd991.1638190762.git.lorenzo@kernel.org


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

include/net/cfg80211.h

+10 −10
Original line number Diff line number Diff line
@@ -4073,14 +4073,14 @@ struct mgmt_frame_regs { 
 *	those to decrypt (Re)Association Request and encrypt (Re)Association

 *	Response frame.

 *

 * @set_radar_offchan: Configure dedicated offchannel chain available for

 * @set_radar_background: Configure dedicated offchannel chain available for

 *	radar/CAC detection on some hw. This chain can't be used to transmit

 *	or receive frames and it is bounded to a running wdev.

 *	Offchannel radar/CAC detection allows to avoid the CAC downtime

 *	Background radar/CAC detection allows to avoid the CAC downtime

 *	switching to a different channel during CAC detection on the selected

 *	radar channel.

 *	The caller is expected to set chandef pointer to NULL in order to

 *	disable offchannel CAC/radar detection.

 *	disable background CAC/radar detection.

 */

struct cfg80211_ops {

	int	(*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
@@ -4413,7 +4413,7 @@ struct cfg80211_ops { 
				struct cfg80211_color_change_settings *params);

	int     (*set_fils_aad)(struct wiphy *wiphy, struct net_device *dev,

				struct cfg80211_fils_aad *fils_aad);

	int	(*set_radar_offchan)(struct wiphy *wiphy,

	int	(*set_radar_background)(struct wiphy *wiphy,

					struct cfg80211_chan_def *chandef);

};
@@ -7626,7 +7626,7 @@ cfg80211_radar_event(struct wiphy *wiphy, 
}



static inline void

cfg80211_offchan_radar_event(struct wiphy *wiphy,

cfg80211_background_radar_event(struct wiphy *wiphy,

				struct cfg80211_chan_def *chandef,

				gfp_t gfp)

{
@@ -7663,13 +7663,13 @@ void cfg80211_cac_event(struct net_device *netdev, 
			enum nl80211_radar_event event, gfp_t gfp);



/**

 * cfg80211_offchan_cac_abort - Channel Availability Check offchan abort event

 * cfg80211_background_cac_abort - Channel Availability Check offchan abort event

 * @wiphy: the wiphy

 *

 * This function is called by the driver when a Channel Availability Check

 * (CAC) is aborted by a offchannel dedicated chain.

 */

void cfg80211_offchan_cac_abort(struct wiphy *wiphy);

void cfg80211_background_cac_abort(struct wiphy *wiphy);



/**

 * cfg80211_gtk_rekey_notify - notify userspace about driver rekeying

include/net/mac80211.h

+5 −5
Original line number Diff line number Diff line
@@ -3939,14 +3939,14 @@ struct ieee80211_prep_tx_info { 
 *	twt structure.

 * @twt_teardown_request: Update the hw with TWT teardown request received

 *	from the peer.

 * @set_radar_offchan: Configure dedicated offchannel chain available for

 * @set_radar_background: Configure dedicated offchannel chain available for

 *	radar/CAC detection on some hw. This chain can't be used to transmit

 *	or receive frames and it is bounded to a running wdev.

 *	Offchannel radar/CAC detection allows to avoid the CAC downtime

 *	Background radar/CAC detection allows to avoid the CAC downtime

 *	switching to a different channel during CAC detection on the selected

 *	radar channel.

 *	The caller is expected to set chandef pointer to NULL in order to

 *	disable offchannel CAC/radar detection.

 *	disable background CAC/radar detection.

 * @net_fill_forward_path: Called from .ndo_fill_forward_path in order to

 *	resolve a path for hardware flow offloading

 */
@@ -4277,7 +4277,7 @@ struct ieee80211_ops { 
			      struct ieee80211_twt_setup *twt);

	void (*twt_teardown_request)(struct ieee80211_hw *hw,

				     struct ieee80211_sta *sta, u8 flowid);

	int (*set_radar_offchan)(struct ieee80211_hw *hw,

	int (*set_radar_background)(struct ieee80211_hw *hw,

				    struct cfg80211_chan_def *chandef);

	int (*net_fill_forward_path)(struct ieee80211_hw *hw,

				     struct ieee80211_vif *vif,

include/uapi/linux/nl80211.h

+7 −7
Original line number Diff line number Diff line
@@ -2646,10 +2646,10 @@ enum nl80211_commands { 
 *	Mandatory parameter for the transmitting interface to enable MBSSID.

 *	Optional for the non-transmitting interfaces.

 *

 * @NL80211_ATTR_RADAR_OFFCHAN: Configure dedicated offchannel chain available for

 *	radar/CAC detection on some hw. This chain can't be used to transmit

 *	or receive frames and it is bounded to a running wdev.

 *	Offchannel radar/CAC detection allows to avoid the CAC downtime

 * @NL80211_ATTR_RADAR_BACKGROUND: Configure dedicated offchannel chain

 *	available for radar/CAC detection on some hw. This chain can't be used

 *	to transmit or receive frames and it is bounded to a running wdev.

 *	Background radar/CAC detection allows to avoid the CAC downtime

 *	switching on a different channel during CAC detection on the selected

 *	radar channel.

 *
@@ -3159,7 +3159,7 @@ enum nl80211_attrs { 
	NL80211_ATTR_MBSSID_CONFIG,

	NL80211_ATTR_MBSSID_ELEMS,



	NL80211_ATTR_RADAR_OFFCHAN,

	NL80211_ATTR_RADAR_BACKGROUND,



	/* add attributes here, update the policy in nl80211.c */
@@ -6066,7 +6066,7 @@ enum nl80211_feature_flags { 
 *	frames. Userspace has to share FILS AAD details to the driver by using

 *	@NL80211_CMD_SET_FILS_AAD.

 *

 * @NL80211_EXT_FEATURE_RADAR_OFFCHAN: Device supports offchannel radar/CAC

 * @NL80211_EXT_FEATURE_RADAR_BACKGROUND: Device supports background radar/CAC

 *	detection.

 *

 * @NUM_NL80211_EXT_FEATURES: number of extended features.
@@ -6135,7 +6135,7 @@ enum nl80211_ext_feature_index { 
	NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE,

	NL80211_EXT_FEATURE_BSS_COLOR,

	NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD,

	NL80211_EXT_FEATURE_RADAR_OFFCHAN,

	NL80211_EXT_FEATURE_RADAR_BACKGROUND,



	/* add new features before the definition below */

	NUM_NL80211_EXT_FEATURES,

net/mac80211/cfg.c

+5 −5
Original line number Diff line number Diff line
@@ -4414,15 +4414,15 @@ ieee80211_color_change(struct wiphy *wiphy, struct net_device *dev, 
}



static int

ieee80211_set_radar_offchan(struct wiphy *wiphy,

ieee80211_set_radar_background(struct wiphy *wiphy,

			       struct cfg80211_chan_def *chandef)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);



	if (!local->ops->set_radar_offchan)

	if (!local->ops->set_radar_background)

		return -EOPNOTSUPP;



	return local->ops->set_radar_offchan(&local->hw, chandef);

	return local->ops->set_radar_background(&local->hw, chandef);

}



const struct cfg80211_ops mac80211_config_ops = {
@@ -4529,5 +4529,5 @@ const struct cfg80211_ops mac80211_config_ops = { 
	.reset_tid_config = ieee80211_reset_tid_config,

	.set_sar_specs = ieee80211_set_sar_specs,

	.color_change = ieee80211_color_change,

	.set_radar_offchan = ieee80211_set_radar_offchan,

	.set_radar_background = ieee80211_set_radar_background,

};

net/wireless/chan.c

+3 −3
Original line number Diff line number Diff line
@@ -718,13 +718,13 @@ static bool 
cfg80211_offchan_chain_is_active(struct cfg80211_registered_device *rdev,

				 struct ieee80211_channel *channel)

{

	if (!rdev->offchan_radar_wdev)

	if (!rdev->background_radar_wdev)

		return false;



	if (!cfg80211_chandef_valid(&rdev->offchan_radar_chandef))

	if (!cfg80211_chandef_valid(&rdev->background_radar_chandef))

		return false;



	return cfg80211_is_sub_chan(&rdev->offchan_radar_chandef, channel);

	return cfg80211_is_sub_chan(&rdev->background_radar_chandef, channel);

}



bool cfg80211_any_wiphy_oper_chan(struct wiphy *wiphy,