wifi: cfg80211: handle color change per link

Currently, during color change, no link id information is passed down.
In order to support color change during Multi Link Operation, it is
required to pass link id as well.
Additionally, update notification APIs to allow drivers/mac80211 to
pass the link ID.

Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
Link: https://msgid.link/20240422053412.2024075-2-quic_adisi@quicinc.com
Link: https://msgid.link/20240422053412.2024075-3-quic_adisi@quicinc.com
[squash, actually only pass 0 from mac80211]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 0112d645a2b4cf9830602d46a7ae51eef23616f7..cbf1664dc569cdc2bda51164d21e2f5afb18edb0 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1577,6 +1577,8 @@ struct cfg80211_csa_settings {
  * @beacon_next: beacon data to be used after the color change
  * @count: number of beacons until the color change
  * @color: the color used after the change
+ * @link_id: defines the link on which color change is expected during MLO.
+ *     0 in case of non-MLO.
  */
 struct cfg80211_color_change_settings {
        struct cfg80211_beacon_data beacon_color_change;
@@ -1585,6 +1587,7 @@ struct cfg80211_color_change_settings {
        struct cfg80211_beacon_data beacon_next;
        u8 count;
        u8 color;
+       u8 link_id;
 };
 
 /**
@@ -9425,70 +9428,78 @@ void cfg80211_bss_flush(struct wiphy *wiphy);
  * @cmd: the actual event we want to notify
  * @count: the number of TBTTs until the color change happens
  * @color_bitmap: representations of the colors that the local BSS is aware of
+ * @link_id: valid link_id in case of MLO or 0 for non-MLO.
  *
  * Return: 0 on success. Non-zero on error.
  */
 int cfg80211_bss_color_notify(struct net_device *dev,
                              enum nl80211_commands cmd, u8 count,
-                             u64 color_bitmap);
+                             u64 color_bitmap, u8 link_id);
 
 /**
  * cfg80211_obss_color_collision_notify - notify about bss color collision
  * @dev: network device
  * @color_bitmap: representations of the colors that the local BSS is aware of
+ * @link_id: valid link_id in case of MLO or 0 for non-MLO.
  *
  * Return: 0 on success. Non-zero on error.
  */
 static inline int cfg80211_obss_color_collision_notify(struct net_device *dev,
-                                                      u64 color_bitmap)
+                                                      u64 color_bitmap,
+                                                      u8 link_id)
 {
        return cfg80211_bss_color_notify(dev, NL80211_CMD_OBSS_COLOR_COLLISION,
-                                        0, color_bitmap);
+                                        0, color_bitmap, link_id);
 }
 
 /**
  * cfg80211_color_change_started_notify - notify color change start
  * @dev: the device on which the color is switched
  * @count: the number of TBTTs until the color change happens
+ * @link_id: valid link_id in case of MLO or 0 for non-MLO.
  *
  * Inform the userspace about the color change that has started.
  *
  * Return: 0 on success. Non-zero on error.
  */
 static inline int cfg80211_color_change_started_notify(struct net_device *dev,
-                                                      u8 count)
+                                                      u8 count, u8 link_id)
 {
        return cfg80211_bss_color_notify(dev, NL80211_CMD_COLOR_CHANGE_STARTED,
-                                        count, 0);
+                                        count, 0, link_id);
 }
 
 /**
  * cfg80211_color_change_aborted_notify - notify color change abort
  * @dev: the device on which the color is switched
+ * @link_id: valid link_id in case of MLO or 0 for non-MLO.
  *
  * Inform the userspace about the color change that has aborted.
  *
  * Return: 0 on success. Non-zero on error.
  */
-static inline int cfg80211_color_change_aborted_notify(struct net_device *dev)
+static inline int cfg80211_color_change_aborted_notify(struct net_device *dev,
+                                                      u8 link_id)
 {
        return cfg80211_bss_color_notify(dev, NL80211_CMD_COLOR_CHANGE_ABORTED,
-                                        0, 0);
+                                        0, 0, link_id);
 }
 
 /**
  * cfg80211_color_change_notify - notify color change completion
  * @dev: the device on which the color was switched
+ * @link_id: valid link_id in case of MLO or 0 for non-MLO.
  *
  * Inform the userspace about the color change that has completed.
  *
  * Return: 0 on success. Non-zero on error.
  */
-static inline int cfg80211_color_change_notify(struct net_device *dev)
+static inline int cfg80211_color_change_notify(struct net_device *dev,
+                                              u8 link_id)
 {
        return cfg80211_bss_color_notify(dev,
                                         NL80211_CMD_COLOR_CHANGE_COMPLETED,
-                                        0, 0);
+                                        0, 0, link_id);
 }
 
 /**

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 44971a62d798ef7042afac8a4f12909610a18b94..4131ad6c1de3aa849527aebfd7eb343d7ecad73a 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -3924,7 +3924,7 @@ static void ieee80211_color_change_abort(struct ieee80211_sub_if_data  *sdata)
 
        ieee80211_free_next_beacon(&sdata->deflink);
 
-       cfg80211_color_change_aborted_notify(sdata->dev);
+       cfg80211_color_change_aborted_notify(sdata->dev, 0);
 }
 
 static int
@@ -4772,14 +4772,14 @@ static int ieee80211_color_change_finalize(struct ieee80211_sub_if_data *sdata)
 
        err = ieee80211_set_after_color_change_beacon(sdata, &changed);
        if (err) {
-               cfg80211_color_change_aborted_notify(sdata->dev);
+               cfg80211_color_change_aborted_notify(sdata->dev, 0);
                return err;
        }
 
        ieee80211_color_change_bss_config_notify(sdata,
                                                 sdata->vif.bss_conf.color_change_color,
                                                 1, changed);
-       cfg80211_color_change_notify(sdata->dev);
+       cfg80211_color_change_notify(sdata->dev, 0);
 
        return 0;
 }
@@ -4812,7 +4812,7 @@ void ieee80211_color_collision_detection_work(struct work_struct *work)
                             color_collision_detect_work);
        struct ieee80211_sub_if_data *sdata = link->sdata;
 
-       cfg80211_obss_color_collision_notify(sdata->dev, link->color_bitmap);
+       cfg80211_obss_color_collision_notify(sdata->dev, link->color_bitmap, 0);
 }
 
 void ieee80211_color_change_finish(struct ieee80211_vif *vif)
@@ -4876,7 +4876,7 @@ ieee80211_color_change(struct wiphy *wiphy, struct net_device *dev,
        sdata->vif.bss_conf.color_change_active = true;
        sdata->vif.bss_conf.color_change_color = params->color;
 
-       cfg80211_color_change_started_notify(sdata->dev, params->count);
+       cfg80211_color_change_started_notify(sdata->dev, params->count, 0);
 
        if (changed)
                ieee80211_color_change_bss_config_notify(sdata, 0, 0, changed);

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index f391b405594485917a14378bfc24466622901a02..1886f78d9c3ce0a638340289440e519cdf9c67f2 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -16032,6 +16032,7 @@ static int nl80211_color_change(struct sk_buff *skb, struct genl_info *info)
                params.counter_offset_presp = offset;
        }
 
+       params.link_id = nl80211_link_id(info->attrs);
        err = rdev_color_change(rdev, dev, &params);
 
 out:
@@ -17434,7 +17435,8 @@ static const struct genl_small_ops nl80211_small_ops[] = {
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
                .doit = nl80211_color_change,
                .flags = GENL_UNS_ADMIN_PERM,
-               .internal_flags = IFLAGS(NL80211_FLAG_NEED_NETDEV_UP),
+               .internal_flags = IFLAGS(NL80211_FLAG_NEED_NETDEV_UP |
+                                        NL80211_FLAG_MLO_VALID_LINK_ID),
        },
        {
                .cmd = NL80211_CMD_SET_FILS_AAD,
@@ -19456,7 +19458,7 @@ EXPORT_SYMBOL(cfg80211_ch_switch_started_notify);
 
 int cfg80211_bss_color_notify(struct net_device *dev,
                              enum nl80211_commands cmd, u8 count,
-                             u64 color_bitmap)
+                             u64 color_bitmap, u8 link_id)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct wiphy *wiphy = wdev->wiphy;
@@ -19479,6 +19481,10 @@ int cfg80211_bss_color_notify(struct net_device *dev,
        if (nla_put_u32(msg, NL80211_ATTR_IFINDEX, dev->ifindex))
                goto nla_put_failure;
 
+       if (wdev->valid_links &&
+           nla_put_u8(msg, NL80211_ATTR_MLO_LINK_ID, link_id))
+               goto nla_put_failure;
+
        if (cmd == NL80211_CMD_COLOR_CHANGE_STARTED &&
            nla_put_u32(msg, NL80211_ATTR_COLOR_CHANGE_COUNT, count))
                goto nla_put_failure;

diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index df013c98b80dfb0e06a86a78415e51d79cd76693..9bf987519811c461fbf195fb4adbbcc272aee02f 100644 (file)
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@ -2842,6 +2842,7 @@ TRACE_EVENT(rdev_color_change,
                __field(u8, count)
                __field(u16, bcn_ofs)
                __field(u16, pres_ofs)
+               __field(u8, link_id)
        ),
        TP_fast_assign(
                WIPHY_ASSIGN;
@@ -2849,11 +2850,12 @@ TRACE_EVENT(rdev_color_change,
                __entry->count = params->count;
                __entry->bcn_ofs = params->counter_offset_beacon;
                __entry->pres_ofs = params->counter_offset_presp;
+               __entry->link_id = params->link_id;
        ),
        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT
-                 ", count: %u",
+                 ", count: %u, link_id: %d",
                  WIPHY_PR_ARG, NETDEV_PR_ARG,
-                 __entry->count)
+                 __entry->count, __entry->link_id)
 );
 
 TRACE_EVENT(rdev_set_radar_background,