wireless: Support assoc-at timer in sta-info
Subsystems (2)
PATCH v2 1/2 wireless: Support assoc-at timer in sta-info
From: Ben Greear <[email protected]>
Report time stamp of when sta became associated.
This is the boottime clock, units are nano-seconds.
Signed-off-by Ben Greear <[email protected]>
---
v2: I had forgotten to refresh the 2/2 patch.
include/net/cfg80211.h | 2 ++ include/uapi/linux/nl80211.h | 2 ++ net/wireless/nl80211.c | 1 + 3 files changed, 5 insertions(+)
include/net/cfg80211.h +2 -0
@@ -1306,6 +1306,7 @@ struct cfg80211_tid_stats {* indicate the relevant values in this struct for them * @connected_time: time(in secs) since a station is last connected * @inactive_time: time since last station activity (tx/rx) in milliseconds +* @assoc_at: bootime (ns) of the last association * @rx_bytes: bytes (size of MPDUs) received from this station * @tx_bytes: bytes (size of MPDUs) transmitted to this station * @llid: mesh local link id
@@ -1366,6 +1367,7 @@ struct station_info {u64 filled;u32 connected_time;u32 inactive_time; +u64 assoc_at;u64 rx_bytes;u64 tx_bytes;u16 llid;
include/uapi/linux/nl80211.h +2 -0
@@ -3175,6 +3175,7 @@ enum nl80211_sta_bss_param {* sent to the station (u64, usec) * @NL80211_STA_INFO_AIRTIME_WEIGHT: current airtime weight for station (u16) * @NL80211_STA_INFO_AIRTIME_LINK_METRIC: airtime link metric for mesh station +* @NL80211_STA_INFO_ASSOC_AT_BOOTTIME: Timestamp of last association * @__NL80211_STA_INFO_AFTER_LAST: internal * @NL80211_STA_INFO_MAX: highest possible station info attribute */
@@ -3221,6 +3222,7 @@ enum nl80211_sta_info {NL80211_STA_INFO_TX_DURATION ,NL80211_STA_INFO_AIRTIME_WEIGHT ,NL80211_STA_INFO_AIRTIME_LINK_METRIC , +NL80211_STA_INFO_ASSOC_AT_BOOTTIME ,/* keep last */ __NL80211_STA_INFO_AFTER_LAST,
net/wireless/nl80211.c +1 -0
@@ -5028,6 +5028,7 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,PUT_SINFO (CONNECTED_TIME , connected_time, u32);PUT_SINFO (INACTIVE_TIME , inactive_time, u32); +PUT_SINFO_U64 (ASSOC_AT_BOOTTIME , assoc_at); if (sinfo->filled & (BIT_ULL(NL80211_STA_INFO_RX_BYTES) | BIT_ULL(NL80211_STA_INFO_RX_BYTES64)) &&
Signature · 1 line
2.20.1
PATCH v2 2/2 mac80211: add assoc-at support.
From: Ben Greear <[email protected]>
Report timestamp for when sta becomes associated.
Signed-off-by Ben Greear <[email protected]>
--- net/mac80211/sta_info.c | 3 +++ net/mac80211/sta_info.h | 2 ++ 2 files changed, 5 insertions(+)
net/mac80211/sta_info.c +3 -0
@@ -1995,6 +1995,7 @@ int sta_info_move_state(struct sta_info *sta,case IEEE80211_STA_ASSOC :if (sta->sta_state ==IEEE80211_STA_AUTH ) {set_bit (WLAN_STA_ASSOC , &sta->_flags); + sta->assoc_at =ktime_get_boot_ns ();ieee80211_recalc_min_chandef (sta->sdata);if (!sta->sta.support_p2p_ps)ieee80211_recalc_p2p_go_ps_allowed (sta->sdata);
@@ -2224,6 +2225,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,BIT_ULL (NL80211_STA_INFO_STA_FLAGS ) |BIT_ULL (NL80211_STA_INFO_BSS_PARAM ) |BIT_ULL (NL80211_STA_INFO_CONNECTED_TIME ) | +BIT_ULL (NL80211_STA_INFO_ASSOC_AT_BOOTTIME ) |BIT_ULL (NL80211_STA_INFO_RX_DROP_MISC );if (sdata->vif.type ==NL80211_IFTYPE_STATION ) {
@@ -2232,6 +2234,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo, } sinfo->connected_time =ktime_get_seconds () - sta->last_connected; + sinfo->assoc_at = sta->assoc_at; sinfo->inactive_time =jiffies_to_msecs (jiffies -ieee80211_sta_last_active (sta));
net/mac80211/sta_info.h +2 -0
@@ -468,6 +468,7 @@ struct ieee80211_sta_rx_stats {* the station when it leaves powersave or polls for frames * @driver_buffered_tids: bitmap of TIDs the driver has data buffered on * @txq_buffered_tids: bitmap of TIDs that mac80211 has txq data buffered on +* @assoc_at: clock boottime (in ns) of last association * @last_connected: time (in seconds) when a station got connected * @last_seq_ctrl: last received seq/frag number from this STA (per TID * plus one for non-QoS frames)
@@ -565,6 +566,7 @@ struct sta_info {unsigned long driver_buffered_tids;unsigned long txq_buffered_tids; +unsigned long assoc_at;long last_connected;/* Updated from RX path only, no locking requirements */
Signature · 1 line
2.20.1