Commit 8e4687f6 authored by Kalle Valo's avatar Kalle Valo Committed by Johannes Berg

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: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20231012114229.2931808-3-kvalo@kernel.orgSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 2703bc85
...@@ -7269,7 +7269,7 @@ void cfg80211_rx_mlme_mgmt(struct net_device *dev, const u8 *buf, size_t len); ...@@ -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); 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 * @bss: the BSS that association was requested with, ownership of the pointer
* moves to cfg80211 in the call to cfg80211_rx_assoc_resp() * moves to cfg80211 in the call to cfg80211_rx_assoc_resp()
* @buf: (Re)Association Response frame (header + body) * @buf: (Re)Association Response frame (header + body)
...@@ -7284,7 +7284,7 @@ void cfg80211_auth_timeout(struct net_device *dev, const u8 *addr); ...@@ -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 * @links.status: Set this (along with a BSS pointer) for links that
* were rejected by the AP. * were rejected by the AP.
*/ */
struct cfg80211_rx_assoc_resp { struct cfg80211_rx_assoc_resp_data {
const u8 *buf; const u8 *buf;
size_t len; size_t len;
const u8 *req_ies; const u8 *req_ies;
...@@ -7301,7 +7301,7 @@ struct cfg80211_rx_assoc_resp { ...@@ -7301,7 +7301,7 @@ struct cfg80211_rx_assoc_resp {
/** /**
* cfg80211_rx_assoc_resp - notification of processed association response * cfg80211_rx_assoc_resp - notification of processed association response
* @dev: network device * @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 * After being asked to associate via cfg80211_ops::assoc() the driver must
* call either this function or cfg80211_auth_timeout(). * call either this function or cfg80211_auth_timeout().
...@@ -7309,7 +7309,7 @@ struct cfg80211_rx_assoc_resp { ...@@ -7309,7 +7309,7 @@ struct cfg80211_rx_assoc_resp {
* This function may sleep. The caller must hold the corresponding wdev's mutex. * This function may sleep. The caller must hold the corresponding wdev's mutex.
*/ */
void cfg80211_rx_assoc_resp(struct net_device *dev, 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 * struct cfg80211_assoc_failure - association failure data
......
...@@ -5281,7 +5281,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, ...@@ -5281,7 +5281,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
.u.mlme.data = ASSOC_EVENT, .u.mlme.data = ASSOC_EVENT,
}; };
struct ieee80211_prep_tx_info info = {}; struct ieee80211_prep_tx_info info = {};
struct cfg80211_rx_assoc_resp resp = { struct cfg80211_rx_assoc_resp_data resp = {
.uapsd_queues = -1, .uapsd_queues = -1,
}; };
u8 ap_mld_addr[ETH_ALEN] __aligned(2); u8 ap_mld_addr[ETH_ALEN] __aligned(2);
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
void cfg80211_rx_assoc_resp(struct net_device *dev, 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 wireless_dev *wdev = dev->ieee80211_ptr;
struct wiphy *wiphy = wdev->wiphy; struct wiphy *wiphy = wdev->wiphy;
......
...@@ -17799,7 +17799,7 @@ void nl80211_send_rx_auth(struct cfg80211_registered_device *rdev, ...@@ -17799,7 +17799,7 @@ void nl80211_send_rx_auth(struct cfg80211_registered_device *rdev,
void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev, void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev,
struct net_device *netdev, 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_send_mlme_event(rdev, netdev, data->buf, data->len,
NL80211_CMD_ASSOCIATE, GFP_KERNEL, NL80211_CMD_ASSOCIATE, GFP_KERNEL,
......
...@@ -60,7 +60,7 @@ void nl80211_send_rx_auth(struct cfg80211_registered_device *rdev, ...@@ -60,7 +60,7 @@ void nl80211_send_rx_auth(struct cfg80211_registered_device *rdev,
const u8 *buf, size_t len, gfp_t gfp); const u8 *buf, size_t len, gfp_t gfp);
void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev, void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev,
struct net_device *netdev, 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, void nl80211_send_deauth(struct cfg80211_registered_device *rdev,
struct net_device *netdev, struct net_device *netdev,
const u8 *buf, size_t len, const u8 *buf, size_t len,
......
...@@ -2928,7 +2928,7 @@ DEFINE_EVENT(netdev_evt_only, cfg80211_send_rx_auth, ...@@ -2928,7 +2928,7 @@ DEFINE_EVENT(netdev_evt_only, cfg80211_send_rx_auth,
TRACE_EVENT(cfg80211_send_rx_assoc, TRACE_EVENT(cfg80211_send_rx_assoc,
TP_PROTO(struct net_device *netdev, TP_PROTO(struct net_device *netdev,
struct cfg80211_rx_assoc_resp *data), struct cfg80211_rx_assoc_resp_data *data),
TP_ARGS(netdev, data), TP_ARGS(netdev, data),
TP_STRUCT__entry( TP_STRUCT__entry(
NETDEV_ENTRY NETDEV_ENTRY
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment