Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

wireless: Set some stats used by /proc/net/wireless (wext)

Browse Source 
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 <greearb@candelatech.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Ben Greear 2010-10-07 16:39:20 -07:00 committed by John W. Linville
parent b38afa8769
commit 5a5c731aa5
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/cfg80211.h
View File

@ -403,6 +403,7 @@ struct station_parameters {
* @STATION_INFO_TX_PACKETS: @tx_packets filled * @STATION_INFO_TX_PACKETS: @tx_packets filled
* @STATION_INFO_TX_RETRIES: @tx_retries filled * @STATION_INFO_TX_RETRIES: @tx_retries filled
* @STATION_INFO_TX_FAILED: @tx_failed filled * @STATION_INFO_TX_FAILED: @tx_failed filled
* @STATION_INFO_RX_DROP_MISC: @rx_dropped_misc filled
*/ */
enum station_info_flags { enum station_info_flags {
STATION_INFO_INACTIVE_TIME = 1<<0, STATION_INFO_INACTIVE_TIME = 1<<0,
@ -417,6 +418,7 @@ enum station_info_flags {
STATION_INFO_TX_PACKETS = 1<<9, STATION_INFO_TX_PACKETS = 1<<9,
STATION_INFO_TX_RETRIES = 1<<10, STATION_INFO_TX_RETRIES = 1<<10,
STATION_INFO_TX_FAILED = 1<<11, 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_packets: packets transmitted to this station
* @tx_retries: cumulative retry counts * @tx_retries: cumulative retry counts
* @tx_failed: number of failed transmissions (retries exceeded, no ACK) * @tx_failed: number of failed transmissions (retries exceeded, no ACK)
* @rx_dropped_misc: Dropped for un-specified reason.
* @generation: generation number for nl80211 dumps. * @generation: generation number for nl80211 dumps.
* This number should increase every time the list of stations * This number should increase every time the list of stations
* changes, i.e. when a station is added or removed, so that * changes, i.e. when a station is added or removed, so that
@ -487,6 +490,7 @@ struct station_info {
u32 tx_packets; u32 tx_packets;
u32 tx_retries; u32 tx_retries;
u32 tx_failed; u32 tx_failed;
u32 rx_dropped_misc;
int generation; int generation;
}; };

4
net/mac80211/cfg.c
View File

@ -329,7 +329,8 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
STATION_INFO_TX_PACKETS | STATION_INFO_TX_PACKETS |
STATION_INFO_TX_RETRIES | STATION_INFO_TX_RETRIES |
STATION_INFO_TX_FAILED | 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->inactive_time = jiffies_to_msecs(jiffies - sta->last_rx);
sinfo->rx_bytes = sta->rx_bytes; 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_packets = sta->tx_packets;
sinfo->tx_retries = sta->tx_retry_count; sinfo->tx_retries = sta->tx_retry_count;
sinfo->tx_failed = sta->tx_retry_failed; sinfo->tx_failed = sta->tx_retry_failed;
sinfo->rx_dropped_misc = sta->rx_dropped;
if ((sta->local->hw.flags & IEEE80211_HW_SIGNAL_DBM) || if ((sta->local->hw.flags & IEEE80211_HW_SIGNAL_DBM) ||
(sta->local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)) { (sta->local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)) {

4
net/wireless/wext-compat.c
View File

@ -1366,6 +1366,10 @@ struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
} }
wstats.qual.updated |= IW_QUAL_NOISE_INVALID; 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; return &wstats;
} }