wifi: cfg80211: move DFS related members to links[] in wireless_dev

A few members related to DFS handling are currently under per wireless
device data structure. However, in order to support DFS with MLO, there is
a need to have them on a per-link manner.

Hence, as a preliminary step, move members cac_started, cac_start_time
and cac_time_ms to be on a per-link basis.

Since currently, link ID is not known at all places, use default value of
0 for now.

Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
Link: https://patch.msgid.link/20240906064426.2101315-5-quic_adisi@quicinc.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/marvell/mwifiex/11h.c b/drivers/net/wireless/marvell/mwifiex/11h.c
index b90f922f1cdc635cd0adc6226f6ca7eb084f9a7f..fb2cad0967580fc44ca19fcc5a1ab81056195303 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/11h.c
+++ b/drivers/net/wireless/marvell/mwifiex/11h.c
@@ -117,7 +117,7 @@ void mwifiex_dfs_cac_work_queue(struct work_struct *work)
                                     dfs_cac_work);
 
        chandef = priv->dfs_chandef;
-       if (priv->wdev.cac_started) {
+       if (priv->wdev.links[0].cac_started) {
                mwifiex_dbg(priv->adapter, MSG,
                            "CAC timer finished; No radar detected\n");
                cfg80211_cac_event(priv->netdev, &chandef,
@@ -174,7 +174,7 @@ int mwifiex_stop_radar_detection(struct mwifiex_private *priv,
  */
 void mwifiex_abort_cac(struct mwifiex_private *priv)
 {
-       if (priv->wdev.cac_started) {
+       if (priv->wdev.links[0].cac_started) {
                if (mwifiex_stop_radar_detection(priv, &priv->dfs_chandef))
                        mwifiex_dbg(priv->adapter, ERROR,
                                    "failed to stop CAC in FW\n");

diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 5209e1c7d2e796fe6f649fec94d3cba433323243..9d154c42465e910ea47126fb06513213be4b608a 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -1906,7 +1906,7 @@ mwifiex_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev,
        struct mwifiex_sta_node *sta_node;
        u8 deauth_mac[ETH_ALEN];
 
-       if (!priv->bss_started && priv->wdev.cac_started) {
+       if (!priv->bss_started && priv->wdev.links[0].cac_started) {
                mwifiex_dbg(priv->adapter, INFO, "%s: abort CAC!\n", __func__);
                mwifiex_abort_cac(priv);
        }
@@ -4038,7 +4038,7 @@ mwifiex_cfg80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
                return -EBUSY;
        }
 
-       if (priv->wdev.cac_started)
+       if (priv->wdev.links[0].cac_started)
                return -EBUSY;
 
        if (cfg80211_chandef_identical(&params->chandef,

diff --git a/drivers/net/wireless/quantenna/qtnfmac/event.c b/drivers/net/wireless/quantenna/qtnfmac/event.c
index 76b07db284f892e3decd1bc4d611713a9244630d..8bd1e14e5de9ddd16348333192b09f9e67aa0dff 100644 (file)
--- a/drivers/net/wireless/quantenna/qtnfmac/event.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/event.c
@@ -520,21 +520,21 @@ static int qtnf_event_handle_radar(struct qtnf_vif *vif,
                cfg80211_radar_event(wiphy, &chandef, GFP_KERNEL);
                break;
        case QLINK_RADAR_CAC_FINISHED:
-               if (!vif->wdev.cac_started)
+               if (!vif->wdev.links[0].cac_started)
                        break;
 
                cfg80211_cac_event(vif->netdev, &chandef,
                                   NL80211_RADAR_CAC_FINISHED, GFP_KERNEL);
                break;
        case QLINK_RADAR_CAC_ABORTED:
-               if (!vif->wdev.cac_started)
+               if (!vif->wdev.links[0].cac_started)
                        break;
 
                cfg80211_cac_event(vif->netdev, &chandef,
                                   NL80211_RADAR_CAC_ABORTED, GFP_KERNEL);
                break;
        case QLINK_RADAR_CAC_STARTED:
-               if (vif->wdev.cac_started)
+               if (vif->wdev.links[0].cac_started)
                        break;
 
                if (!wiphy_ext_feature_isset(wiphy,

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 192d72c8b46544d332e718da728f32009cbf8a49..727a94a6b7c3e98229aa0c21ea191eecca316aa7 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -6194,9 +6194,6 @@ enum ieee80211_ap_reg_power {
  * @address: The address for this device, valid only if @netdev is %NULL
  * @is_running: true if this is a non-netdev device that has been started, e.g.
  *     the P2P Device.
- * @cac_started: true if DFS channel availability check has been started
- * @cac_start_time: timestamp (jiffies) when the dfs state was entered.
- * @cac_time_ms: CAC time in ms
  * @ps: powersave mode is enabled
  * @ps_timeout: dynamic powersave timeout
  * @ap_unexpected_nlportid: (private) netlink port ID of application
@@ -6220,6 +6217,11 @@ enum ieee80211_ap_reg_power {
  *     unprotected beacon report
  * @links: array of %IEEE80211_MLD_MAX_NUM_LINKS elements containing @addr
  *     @ap and @client for each link
+ * @links[].cac_started: true if DFS channel availability check has been
+ *     started
+ * @links[].cac_start_time: timestamp (jiffies) when the dfs state was
+ *     entered.
+ * @links[].cac_time_ms: CAC time in ms
  * @valid_links: bitmap describing what elements of @links are valid
  */
 struct wireless_dev {
@@ -6261,11 +6263,6 @@ struct wireless_dev {
        u32 owner_nlportid;
        bool nl_owner_dead;
 
-       /* FIXME: need to rework radar detection for MLO */
-       bool cac_started;
-       unsigned long cac_start_time;
-       unsigned int cac_time_ms;
-
 #ifdef CONFIG_CFG80211_WEXT
        /* wext data */
        struct {
@@ -6332,6 +6329,10 @@ struct wireless_dev {
                                struct cfg80211_internal_bss *current_bss;
                        } client;
                };
+
+               bool cac_started;
+               unsigned long cac_start_time;
+               unsigned int cac_time_ms;
        } links[IEEE80211_MLD_MAX_NUM_LINKS];
        u16 valid_links;
 };

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index d3115be54997916a4e05f1746b733277db39e1a8..5725ab6f495f2e18c3bd378f9cf6139d4fb8ef4f 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1662,7 +1662,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev,
        ieee80211_link_info_change_notify(sdata, link,
                                          BSS_CHANGED_BEACON_ENABLED);
 
-       if (sdata->wdev.cac_started) {
+       if (sdata->wdev.links[0].cac_started) {
                chandef = link_conf->chanreq.oper;
                wiphy_delayed_work_cancel(wiphy, &link->dfs_cac_timer_work);
                cfg80211_cac_event(sdata->dev, &chandef,
@@ -3501,9 +3501,9 @@ static void ieee80211_end_cac(struct wiphy *wiphy,
                wiphy_delayed_work_cancel(wiphy,
                                          &sdata->deflink.dfs_cac_timer_work);
 
-               if (sdata->wdev.cac_started) {
+               if (sdata->wdev.links[0].cac_started) {
                        ieee80211_link_release_channel(&sdata->deflink);
-                       sdata->wdev.cac_started = false;
+                       sdata->wdev.links[0].cac_started = false;
                }
        }
 }
@@ -3958,7 +3958,7 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
        if (!list_empty(&local->roc_list) || local->scanning)
                return -EBUSY;
 
-       if (sdata->wdev.cac_started)
+       if (sdata->wdev.links[0].cac_started)
                return -EBUSY;
 
        if (WARN_ON(link_id >= IEEE80211_MLD_MAX_NUM_LINKS))

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 7bb71ac52277387eb4dac967c66765116a411b87..bdaf8e215965f60d578888eda1002abd67259e98 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -552,7 +552,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_do
        wiphy_delayed_work_cancel(local->hw.wiphy,
                                  &sdata->deflink.dfs_cac_timer_work);
 
-       if (sdata->wdev.cac_started) {
+       if (sdata->wdev.links[0].cac_started) {
                chandef = sdata->vif.bss_conf.chanreq.oper;
                WARN_ON(local->suspended);
                ieee80211_link_release_channel(&sdata->deflink);

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 85789c184949cddbd257f028e7bb8fc251767328..79579c89e281a1908abd23f9415bf242e3fc3012 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3039,7 +3039,7 @@ void ieee80211_dfs_cac_timer_work(struct wiphy *wiphy, struct wiphy_work *work)
 
        lockdep_assert_wiphy(sdata->local->hw.wiphy);
 
-       if (sdata->wdev.cac_started) {
+       if (sdata->wdev.links[0].cac_started) {
                ieee80211_link_release_channel(link);
                cfg80211_cac_event(sdata->dev, &chandef,
                                   NL80211_RADAR_CAC_FINISHED,

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 14e18fd9e91915cdbc7349ec2e86dac03a4d91e4..6735620378f48844652e62ad208ba84610197260 100644 (file)
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -585,7 +585,7 @@ static bool __ieee80211_can_leave_ch(struct ieee80211_sub_if_data *sdata)
                return false;
 
        list_for_each_entry(sdata_iter, &local->interfaces, list) {
-               if (sdata_iter->wdev.cac_started)
+               if (sdata_iter->wdev.links[0].cac_started)
                        return false;
        }
 

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 071cbb7929d9056c9e5c0ce62c8455fca3be7234..ab17361dba970bde1182f8fc23c2a77d1d386013 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -3478,7 +3478,7 @@ void ieee80211_dfs_cac_cancel(struct ieee80211_local *local)
                wiphy_delayed_work_cancel(local->hw.wiphy,
                                          &sdata->deflink.dfs_cac_timer_work);
 
-               if (sdata->wdev.cac_started) {
+               if (sdata->wdev.links[0].cac_started) {
                        chandef = sdata->vif.bss_conf.chanreq.oper;
                        ieee80211_link_release_channel(&sdata->deflink);
                        cfg80211_cac_event(sdata->dev,

diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index 34e5acff393510f5622d8891f68a1dd0bf3ab27e..1e3ed29f7cfc1e1260c8a58c4bce0cfa27c87f76 100644 (file)
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -94,7 +94,7 @@ int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
 
        lockdep_assert_held(&rdev->wiphy.mtx);
 
-       if (wdev->cac_started)
+       if (wdev->links[0].cac_started)
                return -EBUSY;
 
        if (wdev->u.ibss.ssid_len)

diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c
index aaca65b66af48e2c27c748c971265304d402e305..2c6654075ca9e86187c6683ae147b21bdc7e27f1 100644 (file)
--- a/net/wireless/mesh.c
+++ b/net/wireless/mesh.c
@@ -127,7 +127,7 @@ int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
        if (!rdev->ops->join_mesh)
                return -EOPNOTSUPP;
 
-       if (wdev->cac_started)
+       if (wdev->links[0].cac_started)
                return -EBUSY;
 
        if (!setup->chandef.chan) {

diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index 4052041a19ead4b42ffe32cbdb6eab3334b8f729..fddd6a62b94200b1b8604d58394cf4ed107ac6ce 100644 (file)
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -1123,13 +1123,14 @@ void cfg80211_cac_event(struct net_device *netdev,
 
        trace_cfg80211_cac_event(netdev, event);
 
-       if (WARN_ON(!wdev->cac_started && event != NL80211_RADAR_CAC_STARTED))
+       if (WARN_ON(!wdev->links[0].cac_started &&
+                   event != NL80211_RADAR_CAC_STARTED))
                return;
 
        switch (event) {
        case NL80211_RADAR_CAC_FINISHED:
-               timeout = wdev->cac_start_time +
-                         msecs_to_jiffies(wdev->cac_time_ms);
+               timeout = wdev->links[0].cac_start_time +
+                         msecs_to_jiffies(wdev->links[0].cac_time_ms);
                WARN_ON(!time_after_eq(jiffies, timeout));
                cfg80211_set_dfs_state(wiphy, chandef, NL80211_DFS_AVAILABLE);
                memcpy(&rdev->cac_done_chandef, chandef,
@@ -1138,10 +1139,10 @@ void cfg80211_cac_event(struct net_device *netdev,
                cfg80211_sched_dfs_chan_update(rdev);
                fallthrough;
        case NL80211_RADAR_CAC_ABORTED:
-               wdev->cac_started = false;
+               wdev->links[0].cac_started = false;
                break;
        case NL80211_RADAR_CAC_STARTED:
-               wdev->cac_started = true;
+               wdev->links[0].cac_started = true;
                break;
        default:
                WARN_ON(1);

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 3a11a1a74a5466f92ad14f28b00eae33a260be47..f4fdf32d5d07ce3bc35a99773610d81dd85e46ef 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6066,7 +6066,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
        if (!rdev->ops->start_ap)
                return -EOPNOTSUPP;
 
-       if (wdev->cac_started)
+       if (wdev->links[0].cac_started)
                return -EBUSY;
 
        if (wdev->links[link_id].ap.beacon_interval)
@@ -10121,7 +10121,7 @@ static int nl80211_start_radar_detection(struct sk_buff *skb,
                goto unlock;
        }
 
-       if (cfg80211_beaconing_iface_active(wdev) || wdev->cac_started) {
+       if (cfg80211_beaconing_iface_active(wdev) || wdev->links[0].cac_started) {
                err = -EBUSY;
                goto unlock;
        }
@@ -10157,9 +10157,9 @@ static int nl80211_start_radar_detection(struct sk_buff *skb,
                default:
                        break;
                }
-               wdev->cac_started = true;
-               wdev->cac_start_time = jiffies;
-               wdev->cac_time_ms = cac_time_ms;
+               wdev->links[0].cac_started = true;
+               wdev->links[0].cac_start_time = jiffies;
+               wdev->links[0].cac_time_ms = cac_time_ms;
        }
 unlock:
        wiphy_unlock(wiphy);

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 4a27f3823e25970c6f4ceaade0040d98efb680ff..898abc6d0609b1025a11f7e383c678799fb6cd23 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -4241,7 +4241,7 @@ static void cfg80211_check_and_end_cac(struct cfg80211_registered_device *rdev)
        list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) {
                struct cfg80211_chan_def *chandef;
 
-               if (!wdev->cac_started)
+               if (!wdev->links[0].cac_started)
                        continue;
 
                /* FIXME: radar detection is tied to link 0 for now */