@@ -2180,6 +2180,10 @@ struct link_station_info {
* @tx_bytes: total bytes (size of MPDUs) transmitted to this station
* @tx_retries: cumulative retry counts (MPDUs)
* @tx_failed: number of failed transmissions (MPDUs) (retries exceeded, no ACK)
+ * @signal: The signal strength, type depends on the wiphy's signal_type.
+ * For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
+ * @txrate: last updated unicast bitrate from this station
+ * @rxrate: last updated unicast bitrate to this station
* @valid_links: bitmap of valid links, or 0 for non-MLO. Drivers fill this
* information in cfg80211_new_sta(), cfg80211_del_sta_sinfo(),
* get_station() and dump_station() callbacks.
@@ -2222,6 +2226,9 @@ struct station_info {
u64 tx_bytes;
u32 tx_retries;
u32 tx_failed;
+ s8 signal;
+ struct rate_info txrate;
+ struct rate_info rxrate;
u16 valid_links;
/* TODO: Need to check and add protection access to links memory */
@@ -6837,7 +6837,8 @@ static int nl80211_fill_link_station(struct sk_buff *msg,
}
static int nl80211_fill_mld_station(struct sk_buff *msg,
- struct station_info *sinfo)
+ struct station_info *sinfo,
+ struct cfg80211_registered_device *rdev)
{
PUT_SINFO(RX_PACKETS, rx_packets, u32);
PUT_SINFO(TX_PACKETS, tx_packets, u32);
@@ -6846,6 +6847,26 @@ static int nl80211_fill_mld_station(struct sk_buff *msg,
PUT_SINFO(TX_RETRIES, tx_retries, u32);
PUT_SINFO(TX_FAILED, tx_failed, u32);
+ switch (rdev->wiphy.signal_type) {
+ case CFG80211_SIGNAL_TYPE_MBM:
+ PUT_SINFO(SIGNAL, signal, u8);
+ break;
+ default:
+ break;
+ }
+
+ if (sinfo->filled & BIT_ULL(NL80211_STA_INFO_TX_BITRATE)) {
+ if (!nl80211_put_sta_rate(msg, &sinfo->txrate,
+ NL80211_STA_INFO_TX_BITRATE))
+ goto nla_put_failure;
+ }
+
+ if (sinfo->filled & BIT_ULL(NL80211_STA_INFO_RX_BITRATE)) {
+ if (!nl80211_put_sta_rate(msg, &sinfo->rxrate,
+ NL80211_STA_INFO_RX_BITRATE))
+ goto nla_put_failure;
+ }
+
return 0;
nla_put_failure:
@@ -6899,7 +6920,7 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
goto nla_put_failure;
if (sinfo->is_per_link_stats_support && sinfo->valid_links) {
- if (nl80211_fill_mld_station(msg, sinfo))
+ if (nl80211_fill_mld_station(msg, sinfo, rdev))
goto nla_put_failure;
/* Closing nested STA_INFO as MLO links ATTR should not
@@ -6977,6 +6998,33 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
#undef PUT_SINFO
#undef PUT_SINFO_U64
+static void cfg80211_sta_set_mld_rate_info(struct rate_info *sinfo_rate,
+ struct rate_info *link_sinfo_rate)
+{
+ if (link_sinfo_rate->flags)
+ sinfo_rate->flags = link_sinfo_rate->flags;
+ if (link_sinfo_rate->legacy)
+ sinfo_rate->legacy = link_sinfo_rate->legacy;
+ if (link_sinfo_rate->mcs)
+ sinfo_rate->mcs = link_sinfo_rate->mcs;
+ if (link_sinfo_rate->nss)
+ sinfo_rate->nss = link_sinfo_rate->nss;
+ if (link_sinfo_rate->bw)
+ sinfo_rate->bw = link_sinfo_rate->bw;
+ if (link_sinfo_rate->he_gi)
+ sinfo_rate->he_gi = link_sinfo_rate->he_gi;
+ if (link_sinfo_rate->he_dcm)
+ sinfo_rate->he_dcm = link_sinfo_rate->he_dcm;
+ if (link_sinfo_rate->he_ru_alloc)
+ sinfo_rate->he_ru_alloc = link_sinfo_rate->he_ru_alloc;
+ if (link_sinfo_rate->n_bonded_ch)
+ sinfo_rate->n_bonded_ch = link_sinfo_rate->n_bonded_ch;
+ if (link_sinfo_rate->eht_gi)
+ sinfo_rate->eht_gi = link_sinfo_rate->eht_gi;
+ if (link_sinfo_rate->eht_ru_alloc)
+ sinfo_rate->eht_ru_alloc = link_sinfo_rate->eht_ru_alloc;
+}
+
static void cfg80211_sta_set_mld_sinfo(struct station_info *sinfo)
{
struct link_station_info *link_sinfo;
@@ -7019,6 +7067,24 @@ static void cfg80211_sta_set_mld_sinfo(struct station_info *sinfo)
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_FAILED);
}
}
+
+ /*TODO: set mld stats for signal based on best values and signal
+ * for last updated, currently using one of the link to fill stats
+ */
+ if (link_sinfo->filled & BIT_ULL(NL80211_STA_INFO_SIGNAL)) {
+ sinfo->signal = link_sinfo->signal;
+ sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL);
+ }
+ if (link_sinfo->filled & BIT_ULL(NL80211_STA_INFO_TX_BITRATE)) {
+ cfg80211_sta_set_mld_rate_info(&sinfo->txrate, &link_sinfo->txrate);
+ sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
+ }
+
+ if (link_sinfo->filled & BIT_ULL(NL80211_STA_INFO_RX_BITRATE)) {
+ cfg80211_sta_set_mld_rate_info(&sinfo->rxrate, &link_sinfo->rxrate);
+ sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BITRATE);
+ }
+
}
static int nl80211_dump_station(struct sk_buff *skb,
Currently, the accumulable statistics for multi-link operation(MLO) are handled. Other statistics, such as signal and rates, are managed at the link level. Therefore, add signal and rates at the MLO level to provide an comprehensive overview of the station. The signal could be the best of all links- e.g. if Link 1 has a signal strength of -70 dBm and Link 2 has -65 dBm, the signal for MLO will be -65 dBm. The rate could be determined based on the most recently updated link- e.g. if link 1 has a rate of 300 Mbps and link 2 has a rate of 450 Mbps, the MLO rate can be calculated based on the inactivity of each link. If the inactive time for link 1 is 20 seconds and for link 2 is 10 seconds, the MLO rate will be the most recently updated rate, which is link 2's rate of 450 Mbps. NOTE: - Currently using one of the link to fill rate and signal. Could add the last updated for rate and best of signal for MLO with actual patches. Signed-off-by: Sarika Sharma <quic_sarishar@quicinc.com> --- include/net/cfg80211.h | 7 +++++ net/wireless/nl80211.c | 70 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 2 deletions(-)