anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BACKPORT: wifi: cfg80211: adjust assoc comeback for MLO

Browse Source 
We only report the BSSID to userspace, so change the
argument from BSS struct pointer to AP address, which
we'll use to carry either the BSSID or AP MLD address.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Bug: 253289327
Change-Id: Ib890447b19eee64d64c315f6bd6b0f546db478b9
(cherry picked from commit e69dac88a155bd626170bb0bb43f83fb564392f7)
[Kiran Kumar Lokere: Skipped the changes in net/mac80211/mlme.c as
the conflict changes not present]
Signed-off-by: Kiran Kumar Lokere <quic_klokere@quicinc.com>
This commit is contained in:
Johannes Berg
2022-06-28 11:25:38 +02:00
committed by Todd Kjos
parent db5bcd0cd8
commit c1bcc88a92
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/cfg80211.h
View File

@@ -8916,13 +8916,13 @@ bool cfg80211_iftype_allowed(struct wiphy *wiphy, enum nl80211_iftype iftype,
* cfg80211_assoc_comeback - notification of association that was
* temporarly rejected with a comeback
* @netdev: network device
* @bss: the bss entry with which association is in progress.
* @ap_addr: AP (MLD) address that rejected the assocation
* @timeout: timeout interval value TUs.
*
* this function may sleep. the caller must hold the corresponding wdev's mutex.
*/
void cfg80211_assoc_comeback(struct net_device *netdev,
struct cfg80211_bss *bss, u32 timeout);
const u8 *ap_addr, u32 timeout);
/* Logging, debugging and troubleshooting/diagnostic helpers. */

6
net/wireless/nl80211.c
View File

@@ -18102,7 +18102,7 @@ static void nl80211_send_remain_on_chan_event(
}
void cfg80211_assoc_comeback(struct net_device *netdev,
struct cfg80211_bss *bss, u32 timeout)
const u8 *ap_addr, u32 timeout)
{
struct wireless_dev *wdev = netdev->ieee80211_ptr;
struct wiphy *wiphy = wdev->wiphy;
@@ -18110,7 +18110,7 @@ void cfg80211_assoc_comeback(struct net_device *netdev,
struct sk_buff *msg;
void *hdr;
trace_cfg80211_assoc_comeback(wdev, bss->bssid, timeout);
trace_cfg80211_assoc_comeback(wdev, ap_addr, timeout);
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
if (!msg)
@@ -18124,7 +18124,7 @@ void cfg80211_assoc_comeback(struct net_device *netdev,
if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) ||
nla_put_u32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex) ||
nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, bss->bssid) ||
nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, ap_addr) ||
nla_put_u32(msg, NL80211_ATTR_TIMEOUT, timeout))
goto nla_put_failure;

10
net/wireless/trace.h
View File

@@ -3785,20 +3785,20 @@ TRACE_EVENT(cfg80211_bss_color_notify,
);
TRACE_EVENT(cfg80211_assoc_comeback,
TP_PROTO(struct wireless_dev *wdev, const u8 *bssid, u32 timeout),
TP_ARGS(wdev, bssid, timeout),
TP_PROTO(struct wireless_dev *wdev, const u8 *ap_addr, u32 timeout),
TP_ARGS(wdev, ap_addr, timeout),
TP_STRUCT__entry(
WDEV_ENTRY
MAC_ENTRY(bssid)
MAC_ENTRY(ap_addr)
__field(u32, timeout)
),
TP_fast_assign(
WDEV_ASSIGN;
MAC_ASSIGN(bssid, bssid);
MAC_ASSIGN(ap_addr, ap_addr);
__entry->timeout = timeout;
),
TP_printk(WDEV_PR_FMT ", " MAC_PR_FMT ", timeout: %u TUs",
WDEV_PR_ARG, MAC_PR_ARG(bssid), __entry->timeout)
WDEV_PR_ARG, MAC_PR_ARG(ap_addr), __entry->timeout)
);
DECLARE_EVENT_CLASS(link_station_add_mod,