openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] bcm43xx: add useless and broken statistics stuff. People seem to want it. well... 

Signed-off-by: Michael Buesch <mbuesch@freenet.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Michael Buesch 2006-03-22 18:10:19 +01:00 committed by John W. Linville
parent cf017e1b6f
commit 72fb851e97
3 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/bcm43xx/bcm43xx.h
View File

@ -621,6 +621,8 @@ struct bcm43xx_noise_calculation {
struct bcm43xx_stats { struct bcm43xx_stats {
u8 link_quality; u8 link_quality;
u8 noise;
struct iw_statistics wstats;
/* Store the last TX/RX times here for updating the leds. */ /* Store the last TX/RX times here for updating the leds. */
unsigned long last_tx; unsigned long last_tx;
unsigned long last_rx; unsigned long last_rx;

3
drivers/net/wireless/bcm43xx/bcm43xx_main.c
View File

@ -1539,6 +1539,7 @@ static void handle_irq_noise(struct bcm43xx_private *bcm)
average *= 125; average *= 125;
average += 64; average += 64;
average /= 128; average /= 128;
tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x40C); tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x40C);
tmp = (tmp / 128) & 0x1F; tmp = (tmp / 128) & 0x1F;
if (tmp >= 8) if (tmp >= 8)
@ -1550,6 +1551,8 @@ static void handle_irq_noise(struct bcm43xx_private *bcm)
else else
average -= 48; average -= 48;
/* FIXME: This is wrong, but people want fancy stats. well... */
bcm->stats.noise = average;
if (average > -65) if (average > -65)
bcm->stats.link_quality = 0; bcm->stats.link_quality = 0;
else if (average > -75) else if (average > -75)

52
drivers/net/wireless/bcm43xx/bcm43xx_wx.c
View File

@ -244,13 +244,13 @@ static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev,
range->max_qual.qual = 100; range->max_qual.qual = 100;
/* TODO: Real max RSSI */ /* TODO: Real max RSSI */
range->max_qual.level = 0; range->max_qual.level = 3;
range->max_qual.noise = 0; range->max_qual.noise = 100;
range->max_qual.updated = 7; range->max_qual.updated = 7;
range->avg_qual.qual = 70; range->avg_qual.qual = 70;
range->avg_qual.level = 0; range->avg_qual.level = 2;
range->avg_qual.noise = 0; range->avg_qual.noise = 40;
range->avg_qual.updated = 7; range->avg_qual.updated = 7;
range->min_rts = BCM43xx_MIN_RTS_THRESHOLD; range->min_rts = BCM43xx_MIN_RTS_THRESHOLD;
@ -875,6 +875,49 @@ static int bcm43xx_wx_sprom_write(struct net_device *net_dev,
return err; return err;
} }
/* Get wireless statistics. Called by /proc/net/wireless and by SIOCGIWSTATS */
static struct iw_statistics *bcm43xx_get_wireless_stats(struct net_device *net_dev)
{
struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
struct ieee80211softmac_device *mac = ieee80211_priv(net_dev);
struct iw_statistics *wstats;
wstats = &bcm->stats.wstats;
if (!mac->associated) {
wstats->miss.beacon = 0;
// bcm->ieee->ieee_stats.tx_retry_limit_exceeded = 0; // FIXME: should this be cleared here?
wstats->discard.retries = 0;
// bcm->ieee->ieee_stats.tx_discards_wrong_sa = 0; // FIXME: same question
wstats->discard.nwid = 0;
// bcm->ieee->ieee_stats.rx_discards_undecryptable = 0; // FIXME: ditto
wstats->discard.code = 0;
// bcm->ieee->ieee_stats.rx_fragments = 0; // FIXME: same here
wstats->discard.fragment = 0;
wstats->discard.misc = 0;
wstats->qual.qual = 0;
wstats->qual.level = 0;
wstats->qual.noise = 0;
wstats->qual.updated = 7;
wstats->qual.updated |= IW_QUAL_NOISE_INVALID |
IW_QUAL_QUAL_INVALID | IW_QUAL_LEVEL_INVALID;
return wstats;
}
/* fill in the real statistics when iface associated */
wstats->qual.qual = 100; // TODO: get the real signal quality
wstats->qual.level = 3 - bcm->stats.link_quality;
wstats->qual.noise = bcm->stats.noise;
wstats->qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED |
IW_QUAL_NOISE_UPDATED;
wstats->discard.code = bcm->ieee->ieee_stats.rx_discards_undecryptable;
wstats->discard.retries = bcm->ieee->ieee_stats.tx_retry_limit_exceeded;
wstats->discard.nwid = bcm->ieee->ieee_stats.tx_discards_wrong_sa;
wstats->discard.fragment = bcm->ieee->ieee_stats.rx_fragments;
wstats->discard.misc = 0; // FIXME
wstats->miss.beacon = 0; // FIXME
return wstats;
}
#ifdef WX #ifdef WX
# undef WX # undef WX
@ -1010,6 +1053,7 @@ const struct iw_handler_def bcm43xx_wx_handlers_def = {
.num_private_args = ARRAY_SIZE(bcm43xx_priv_wx_args), .num_private_args = ARRAY_SIZE(bcm43xx_priv_wx_args),
.private = bcm43xx_priv_wx_handlers, .private = bcm43xx_priv_wx_handlers,
.private_args = bcm43xx_priv_wx_args, .private_args = bcm43xx_priv_wx_args,
.get_wireless_stats = bcm43xx_get_wireless_stats,
}; };
/* vim: set ts=8 sw=8 sts=8: */ /* vim: set ts=8 sw=8 sts=8: */