summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2022-07-18 10:40:44 +0200
committerJohannes Berg <johannes.berg@intel.com>2022-07-22 14:28:30 +0200
commit6074c9e5747158ab1e6aebedb87f64be77401fd8 (patch)
tree9e354c750915fed2516282192b1f6c22fcbed330
parentf9202638df34474f862109731203e71d8e71f85e (diff)
downloadlinux-6074c9e5747158ab1e6aebedb87f64be77401fd8.tar.gz
linux-6074c9e5747158ab1e6aebedb87f64be77401fd8.tar.bz2
linux-6074c9e5747158ab1e6aebedb87f64be77401fd8.zip
wifi: cfg80211: report link ID in NL80211_CMD_FRAME
If given by the underlying driver, report the link ID for MLO in NL80211_CMD_FRAME. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--include/net/cfg80211.h5
-rw-r--r--net/wireless/nl80211.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 2f5c271bcde1..8545ed098d90 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -7797,6 +7797,9 @@ void cfg80211_conn_failed(struct net_device *dev, const u8 *mac_addr,
*
* @freq: Frequency on which the frame was received in kHz
* @sig_dbm: signal strength in dBm, or 0 if unknown
+ * @have_link_id: indicates the frame was received on a link of
+ * an MLD, i.e. the @link_id field is valid
+ * @link_id: the ID of the link the frame was received on
* @buf: Management frame (header + body)
* @len: length of the frame data
* @flags: flags, as defined in enum nl80211_rxmgmt_flags
@@ -7806,6 +7809,8 @@ void cfg80211_conn_failed(struct net_device *dev, const u8 *mac_addr,
struct cfg80211_rx_info {
int freq;
int sig_dbm;
+ bool have_link_id;
+ u8 link_id;
const u8 *buf;
size_t len;
u32 flags;
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index e5ed0950ef0b..60b8406b8d7e 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -18377,6 +18377,8 @@ int nl80211_send_mgmt(struct cfg80211_registered_device *rdev,
netdev->ifindex)) ||
nla_put_u64_64bit(msg, NL80211_ATTR_WDEV, wdev_id(wdev),
NL80211_ATTR_PAD) ||
+ (info->have_link_id &&
+ nla_put_u8(msg, NL80211_ATTR_MLO_LINK_ID, info->link_id)) ||
nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ, KHZ_TO_MHZ(info->freq)) ||
nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ_OFFSET, info->freq % 1000) ||
(info->sig_dbm &&