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.
Showing the changes to include (3 of 11 files). Show all
Unified · Split
| @@ -4073,14 +4073,14 @@ struct mgmt_frame_regs { · 4072 unmodified lines | ||
| 4073 | 4073 | * those to decrypt (Re)Association Request and encrypt (Re)Association |
| 4074 | 4074 | * Response frame. |
| 4075 | 4075 | * |
| 4076 | − * @set_radar_offchan: Configure dedicated offchannel chain available for | |
| 4076 | + * @set_radar_background: Configure dedicated offchannel chain available for | |
| 4077 | 4077 | * radar/CAC detection on some hw. This chain can't be used to transmit |
| 4078 | 4078 | * or receive frames and it is bounded to a running wdev. |
| 4079 | − * Offchannel radar/CAC detection allows to avoid the CAC downtime | |
| 4079 | + * Background radar/CAC detection allows to avoid the CAC downtime | |
| 4080 | 4080 | * switching to a different channel during CAC detection on the selected |
| 4081 | 4081 | * radar channel. |
| 4082 | 4082 | * The caller is expected to set chandef pointer to NULL in order to |
| 4083 | − * disable offchannel CAC/radar detection. | |
| 4083 | + * disable background CAC/radar detection. | |
| 4084 | 4084 | */ |
| 4085 | 4085 | struct cfg80211_ops { |
| 4086 | 4086 | int (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow); |
| @@ -4413,8 +4413,8 @@ struct cfg80211_ops { · 326 unmodified lines | ||
| 4413 | 4413 | struct cfg80211_color_change_settings *params); |
| 4414 | 4414 | int (*set_fils_aad)(struct wiphy *wiphy, struct net_device *dev, |
| 4415 | 4415 | struct cfg80211_fils_aad *fils_aad); |
| 4416 | − int (*set_radar_offchan)(struct wiphy *wiphy, | |
| 4417 | − struct cfg80211_chan_def *chandef); | |
| 4416 | + int (*set_radar_background)(struct wiphy *wiphy, | |
| 4417 | + struct cfg80211_chan_def *chandef); | |
| 4418 | 4418 | }; |
| 4419 | 4419 | |
| 4420 | 4420 | /* |
| @@ -7626,9 +7626,9 @@ cfg80211_radar_event(struct wiphy *wiphy, · 3205 unmodified lines | ||
| 7626 | 7626 | } |
| 7627 | 7627 | |
| 7628 | 7628 | static inline void |
| 7629 | −cfg80211_offchan_radar_event(struct wiphy *wiphy, | |
| 7630 | − struct cfg80211_chan_def *chandef, | |
| 7631 | − gfp_t gfp) | |
| 7629 | +cfg80211_background_radar_event(struct wiphy *wiphy, | |
| 7630 | + struct cfg80211_chan_def *chandef, | |
| 7631 | + gfp_t gfp) | |
| 7632 | 7632 | { |
| 7633 | 7633 | __cfg80211_radar_event(wiphy, chandef, true, gfp); |
| 7634 | 7634 | } |
| @@ -7663,13 +7663,13 @@ void cfg80211_cac_event(struct net_device *netdev, · 28 unmodified lines | ||
| 7663 | 7663 | enum nl80211_radar_event event, gfp_t gfp); |
| 7664 | 7664 | |
| 7665 | 7665 | /** |
| 7666 | − * cfg80211_offchan_cac_abort - Channel Availability Check offchan abort event | |
| 7666 | + * cfg80211_background_cac_abort - Channel Availability Check offchan abort event | |
| 7667 | 7667 | * @wiphy: the wiphy |
| 7668 | 7668 | * |
| 7669 | 7669 | * This function is called by the driver when a Channel Availability Check |
| 7670 | 7670 | * (CAC) is aborted by a offchannel dedicated chain. |
| 7671 | 7671 | */ |
| 7672 | −void cfg80211_offchan_cac_abort(struct wiphy *wiphy); | |
| 7672 | +void cfg80211_background_cac_abort(struct wiphy *wiphy); | |
| 7673 | 7673 | |
| 7674 | 7674 | /** |
| 7675 | 7675 | * cfg80211_gtk_rekey_notify - notify userspace about driver rekeying |
| @@ -3939,14 +3939,14 @@ struct ieee80211_prep_tx_info { · 3938 unmodified lines | ||
| 3939 | 3939 | * twt structure. |
| 3940 | 3940 | * @twt_teardown_request: Update the hw with TWT teardown request received |
| 3941 | 3941 | * from the peer. |
| 3942 | − * @set_radar_offchan: Configure dedicated offchannel chain available for | |
| 3942 | + * @set_radar_background: Configure dedicated offchannel chain available for | |
| 3943 | 3943 | * radar/CAC detection on some hw. This chain can't be used to transmit |
| 3944 | 3944 | * or receive frames and it is bounded to a running wdev. |
| 3945 | − * Offchannel radar/CAC detection allows to avoid the CAC downtime | |
| 3945 | + * Background radar/CAC detection allows to avoid the CAC downtime | |
| 3946 | 3946 | * switching to a different channel during CAC detection on the selected |
| 3947 | 3947 | * radar channel. |
| 3948 | 3948 | * The caller is expected to set chandef pointer to NULL in order to |
| 3949 | − * disable offchannel CAC/radar detection. | |
| 3949 | + * disable background CAC/radar detection. | |
| 3950 | 3950 | * @net_fill_forward_path: Called from .ndo_fill_forward_path in order to |
| 3951 | 3951 | * resolve a path for hardware flow offloading |
| 3952 | 3952 | */ |
| @@ -4277,8 +4277,8 @@ struct ieee80211_ops { · 324 unmodified lines | ||
| 4277 | 4277 | struct ieee80211_twt_setup *twt); |
| 4278 | 4278 | void (*twt_teardown_request)(struct ieee80211_hw *hw, |
| 4279 | 4279 | struct ieee80211_sta *sta, u8 flowid); |
| 4280 | − int (*set_radar_offchan)(struct ieee80211_hw *hw, | |
| 4281 | − struct cfg80211_chan_def *chandef); | |
| 4280 | + int (*set_radar_background)(struct ieee80211_hw *hw, | |
| 4281 | + struct cfg80211_chan_def *chandef); | |
| 4282 | 4282 | int (*net_fill_forward_path)(struct ieee80211_hw *hw, |
| 4283 | 4283 | struct ieee80211_vif *vif, |
| 4284 | 4284 | struct ieee80211_sta *sta, |
| @@ -2646,10 +2646,10 @@ enum nl80211_commands { · 2645 unmodified lines | ||
| 2646 | 2646 | * Mandatory parameter for the transmitting interface to enable MBSSID. |
| 2647 | 2647 | * Optional for the non-transmitting interfaces. |
| 2648 | 2648 | * |
| 2649 | − * @NL80211_ATTR_RADAR_OFFCHAN: Configure dedicated offchannel chain available for | |
| 2650 | − * radar/CAC detection on some hw. This chain can't be used to transmit | |
| 2651 | − * or receive frames and it is bounded to a running wdev. | |
| 2652 | − * Offchannel radar/CAC detection allows to avoid the CAC downtime | |
| 2649 | + * @NL80211_ATTR_RADAR_BACKGROUND: Configure dedicated offchannel chain | |
| 2650 | + * available for radar/CAC detection on some hw. This chain can't be used | |
| 2651 | + * to transmit or receive frames and it is bounded to a running wdev. | |
| 2652 | + * Background radar/CAC detection allows to avoid the CAC downtime | |
| 2653 | 2653 | * switching on a different channel during CAC detection on the selected |
| 2654 | 2654 | * radar channel. |
| 2655 | 2655 | * |
| @@ -3159,7 +3159,7 @@ enum nl80211_attrs { · 503 unmodified lines | ||
| 3159 | 3159 | NL80211_ATTR_MBSSID_CONFIG, |
| 3160 | 3160 | NL80211_ATTR_MBSSID_ELEMS, |
| 3161 | 3161 | |
| 3162 | − NL80211_ATTR_RADAR_OFFCHAN, | |
| 3162 | + NL80211_ATTR_RADAR_BACKGROUND, | |
| 3163 | 3163 | |
| 3164 | 3164 | /* add attributes here, update the policy in nl80211.c */ |
| 3165 | 3165 | |
| @@ -6066,7 +6066,7 @@ enum nl80211_feature_flags { · 2900 unmodified lines | ||
| 6066 | 6066 | * frames. Userspace has to share FILS AAD details to the driver by using |
| 6067 | 6067 | * @NL80211_CMD_SET_FILS_AAD. |
| 6068 | 6068 | * |
| 6069 | − * @NL80211_EXT_FEATURE_RADAR_OFFCHAN: Device supports offchannel radar/CAC | |
| 6069 | + * @NL80211_EXT_FEATURE_RADAR_BACKGROUND: Device supports background radar/CAC | |
| 6070 | 6070 | * detection. |
| 6071 | 6071 | * |
| 6072 | 6072 | * @NUM_NL80211_EXT_FEATURES: number of extended features. |
| @@ -6135,7 +6135,7 @@ enum nl80211_ext_feature_index { · 62 unmodified lines | ||
| 6135 | 6135 | NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE, |
| 6136 | 6136 | NL80211_EXT_FEATURE_BSS_COLOR, |
| 6137 | 6137 | NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD, |
| 6138 | − NL80211_EXT_FEATURE_RADAR_OFFCHAN, | |
| 6138 | + NL80211_EXT_FEATURE_RADAR_BACKGROUND, | |
| 6139 | 6139 | |
| 6140 | 6140 | /* add new features before the definition below */ |
| 6141 | 6141 | NUM_NL80211_EXT_FEATURES, |