wifi: mac80211: rename struct cfg80211_rx_assoc_resp to cfg80211_rx_assoc_resp_data

make htmldocs warns:

Documentation/driver-api/80211/cfg80211:48: ./include/net/cfg80211.h:7290: WARNING: Duplicate C declaration, also defined at cfg80211:7251.
Declaration is '.. c:function:: void cfg80211_rx_assoc_resp (struct net_device *dev, struct cfg80211_rx_assoc_resp *data)'.

This is because there's a function named cfg80211_rx_assoc_resp() and a struct
named cfg80211_rx_assoc_resp, see previous patch for more info.

To workaround this rename the struct to cfg80211_rx_assoc_resp_data. The
parameter for the function is named 'data' anyway so the naming here is
consistent.

Compile tested only.

Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20231012114229.2931808-3-kvalo@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index ff4ab88393c395f648a5c5c8c70f7b23ed35740a..0e7abb083a777fa671410410fe854ee45c345203 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -7269,7 +7269,7 @@ void cfg80211_rx_mlme_mgmt(struct net_device *dev, const u8 *buf, size_t len);
 void cfg80211_auth_timeout(struct net_device *dev, const u8 *addr);
 
 /**
- * struct cfg80211_rx_assoc_resp - association response data
+ * struct cfg80211_rx_assoc_resp_data - association response data
  * @bss: the BSS that association was requested with, ownership of the pointer
  *     moves to cfg80211 in the call to cfg80211_rx_assoc_resp()
  * @buf: (Re)Association Response frame (header + body)
@@ -7284,7 +7284,7 @@ void cfg80211_auth_timeout(struct net_device *dev, const u8 *addr);
  * @links.status: Set this (along with a BSS pointer) for links that
  *     were rejected by the AP.
  */
-struct cfg80211_rx_assoc_resp {
+struct cfg80211_rx_assoc_resp_data {
        const u8 *buf;
        size_t len;
        const u8 *req_ies;
@@ -7301,7 +7301,7 @@ struct cfg80211_rx_assoc_resp {
 /**
  * cfg80211_rx_assoc_resp - notification of processed association response
  * @dev: network device
- * @data: association response data, &struct cfg80211_rx_assoc_resp
+ * @data: association response data, &struct cfg80211_rx_assoc_resp_data
  *
  * After being asked to associate via cfg80211_ops::assoc() the driver must
  * call either this function or cfg80211_auth_timeout().
@@ -7309,7 +7309,7 @@ struct cfg80211_rx_assoc_resp {
  * This function may sleep. The caller must hold the corresponding wdev's mutex.
  */
 void cfg80211_rx_assoc_resp(struct net_device *dev,
-                           struct cfg80211_rx_assoc_resp *data);
+                           struct cfg80211_rx_assoc_resp_data *data);
 
 /**
  * struct cfg80211_assoc_failure - association failure data

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 54a9f6db799e2070c52a488dbb1987f02a115dde..887b496f2b81ed6bffa96d62adae8c1b4119935f 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -5281,7 +5281,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
                .u.mlme.data = ASSOC_EVENT,
        };
        struct ieee80211_prep_tx_info info = {};
-       struct cfg80211_rx_assoc_resp resp = {
+       struct cfg80211_rx_assoc_resp_data resp = {
                .uapsd_queues = -1,
        };
        u8 ap_mld_addr[ETH_ALEN] __aligned(2);

diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index 579fea2f354889084ffca6cf25d87c8259e7812c..f90f58c65688963f1b6d96c5ae9fa71d0f870be0 100644 (file)
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -22,7 +22,7 @@
 
 
 void cfg80211_rx_assoc_resp(struct net_device *dev,
-                           struct cfg80211_rx_assoc_resp *data)
+                           struct cfg80211_rx_assoc_resp_data *data)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct wiphy *wiphy = wdev->wiphy;

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 2650543dcebeea3b6182975a70f2cbbeb581100b..d468e015d828d5958dae272e0bccf4428ca1cb2d 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -17799,7 +17799,7 @@ void nl80211_send_rx_auth(struct cfg80211_registered_device *rdev,
 
 void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev,
                           struct net_device *netdev,
-                          struct cfg80211_rx_assoc_resp *data)
+                          struct cfg80211_rx_assoc_resp_data *data)
 {
        nl80211_send_mlme_event(rdev, netdev, data->buf, data->len,
                                NL80211_CMD_ASSOCIATE, GFP_KERNEL,

diff --git a/net/wireless/nl80211.h b/net/wireless/nl80211.h
index b4af53f9b22731f288ec8ea7f1dc6c993785c52b..3edd53c389122d66538d49cb66dfabdb3bd01a0f 100644 (file)
--- a/net/wireless/nl80211.h
+++ b/net/wireless/nl80211.h
@@ -60,7 +60,7 @@ void nl80211_send_rx_auth(struct cfg80211_registered_device *rdev,
                          const u8 *buf, size_t len, gfp_t gfp);
 void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev,
                           struct net_device *netdev,
-                          struct cfg80211_rx_assoc_resp *data);
+                          struct cfg80211_rx_assoc_resp_data *data);
 void nl80211_send_deauth(struct cfg80211_registered_device *rdev,
                         struct net_device *netdev,
                         const u8 *buf, size_t len,

diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index f6667bf3fd12d9c8225cb56d830c3df844020a58..30cd1bd58aac0686abb0663dd5b43fc622bea55d 100644 (file)
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@ -2928,7 +2928,7 @@ DEFINE_EVENT(netdev_evt_only, cfg80211_send_rx_auth,
 
 TRACE_EVENT(cfg80211_send_rx_assoc,
        TP_PROTO(struct net_device *netdev,
-                struct cfg80211_rx_assoc_resp *data),
+                struct cfg80211_rx_assoc_resp_data *data),
        TP_ARGS(netdev, data),
        TP_STRUCT__entry(
                NETDEV_ENTRY