wireless: Set some stats used by /proc/net/wireless (wext)
Subsystems (2)
PATCH v2 1/1 wireless: Set some stats used by /proc/net/wireless (wext)
From: Ben Greear <[email protected]>
Some stats for /proc/net/wireless (and wext in general) are not being set. This patch addresses a few of those with values easily obtained from mac80211 core.
Signed-off-by Ben Greear <[email protected]>
---
v1 -> v2: Add and use filled flags.
:100644 100644 183739c... 338248d... M include/net/cfg80211.h
:100644 100644 ecf9b71... 25fb351... M net/mac80211/cfg.c
:100644 100644 6002265... 12222ee... M net/wireless/wext-compat.c
include/net/cfg80211.h | 4 ++++ net/mac80211/cfg.c | 4 +++- net/wireless/wext-compat.c | 4 ++++ 3 files changed, 11 insertions(+), 1 deletions(-)
include/net/cfg80211.h +4 -0
@@ -403,6 +403,7 @@ struct station_parameters {* @STATION_INFO_TX_PACKETS: @tx_packets filled * @STATION_INFO_TX_RETRIES: @tx_retries filled * @STATION_INFO_TX_FAILED: @tx_failed filled +* @STATION_INFO_RX_DROP_MISC: @rx_dropped_misc filled */ enum station_info_flags {STATION_INFO_INACTIVE_TIME =1 <<0 ,
@@ -417,6 +418,7 @@ enum station_info_flags {STATION_INFO_TX_PACKETS =1 <<9 ,STATION_INFO_TX_RETRIES =1 <<10 ,STATION_INFO_TX_FAILED =1 <<11 , + STATION_INFO_RX_DROP_MISC = 1<<12, };/**
@@ -468,6 +470,7 @@ struct rate_info {* @tx_packets: packets transmitted to this station * @tx_retries: cumulative retry counts * @tx_failed: number of failed transmissions (retries exceeded, no ACK) +* @rx_dropped_misc: Dropped for un-specified reason. * @generation: generation number for nl80211 dumps. * This number should increase every time the list of stations * changes, i.e. when a station is added or removed, so that
@@ -487,6 +490,7 @@ struct station_info {u32 tx_packets;u32 tx_retries;u32 tx_failed; +u32 rx_dropped_misc;int generation; };
net/mac80211/cfg.c +3 -1
@@ -329,7 +329,8 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)STATION_INFO_TX_PACKETS |STATION_INFO_TX_RETRIES |STATION_INFO_TX_FAILED | -STATION_INFO_TX_BITRATE ; +STATION_INFO_TX_BITRATE | +STATION_INFO_RX_DROP_MISC ; sinfo->inactive_time =jiffies_to_msecs (jiffies - sta->last_rx); sinfo->rx_bytes = sta->rx_bytes;
@@ -338,6 +339,7 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) sinfo->tx_packets = sta->tx_packets; sinfo->tx_retries = sta->tx_retry_count; sinfo->tx_failed = sta->tx_retry_failed; + sinfo->rx_dropped_misc = sta->rx_dropped;if ((sta->local->hw.flags &IEEE80211_HW_SIGNAL_DBM ) || (sta->local->hw.flags &IEEE80211_HW_SIGNAL_UNSPEC )) {
net/wireless/wext-compat.c +4 -0
@@ -1366,6 +1366,10 @@ struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev) } wstats.qual.updated |=IW_QUAL_NOISE_INVALID ; +if (sinfo.filled &STATION_INFO_RX_DROP_MISC ) + wstats.discard.misc = sinfo.rx_dropped_misc; +if (sinfo.filled &STATION_INFO_TX_FAILED ) + wstats.discard.retries = sinfo.tx_failed;return &wstats; }
Signature · 1 line
1.7.2.2