diff options
author | Bruno Randolf <br1@einfach.org> | 2008-05-08 13:15:40 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-14 16:29:49 -0400 |
commit | 566bfe5a8bcde13188a356f77666f8115813cf31 (patch) | |
tree | 785412c505e9efbd0fac477d71c8ca6945ffce04 /drivers/net/wireless/adm8211.c | |
parent | fac371d9f09f461dfe9fbbceb2a38e2e12164dda (diff) |
mac80211: use hardware flags for signal/noise units
trying to clean up the signal/noise code. the previous code in mac80211 had
confusing names for the related variables, did not have much definition of
what units of signal and noise were provided and used implicit mechanisms from
the wireless extensions.
this patch introduces hardware capability flags to let the hardware specify
clearly if it can provide signal and noise level values and which units it can
provide. this also anticipates possible new units like RCPI in the future.
for signal:
IEEE80211_HW_SIGNAL_UNSPEC - unspecified, unknown, hw specific
IEEE80211_HW_SIGNAL_DB - dB difference to unspecified reference point
IEEE80211_HW_SIGNAL_DBM - dBm, difference to 1mW
for noise we currently only have dBm:
IEEE80211_HW_NOISE_DBM - dBm, difference to 1mW
if IEEE80211_HW_SIGNAL_UNSPEC or IEEE80211_HW_SIGNAL_DB is used the driver has
to provide the maximum value (max_signal) it reports in order for applications
to make sense of the signal values.
i tried my best to find out for each driver what it can provide and update it
but i'm not sure (?) for some of them and used the more conservative guess in
doubt. this can be fixed easily after this patch has been merged by changing
the hardware flags of the driver.
DRIVER SIGNAL MAX NOISE QUAL
-----------------------------------------------------------------
adm8211 unspec(?) 100 n/a missing
at76_usb unspec(?) (?) unused missing
ath5k dBm dBm percent rssi
b43legacy dBm dBm percent jssi(?)
b43 dBm dBm percent jssi(?)
iwl-3945 dBm dBm percent snr+more
iwl-4965 dBm dBm percent snr+more
p54 unspec 127 n/a missing
rt2x00 dBm n/a percent rssi+tx/rx frame success
rt2400 dBm n/a
rt2500pci dBm n/a
rt2500usb dBm n/a
rt61pci dBm n/a
rt73usb dBm n/a
rtl8180 unspec(?) 65 n/a (?)
rtl8187 unspec(?) 65 (?) noise(?)
zd1211 dB(?) 100 n/a percent
drivers/net/wireless/ath5k/base.c: Changes-licensed-under: 3-Clause-BSD
Signed-off-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/adm8211.c')
-rw-r--r-- | drivers/net/wireless/adm8211.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index d93a1de77eb0..7af5d8851f67 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c | |||
@@ -445,9 +445,9 @@ static void adm8211_interrupt_rci(struct ieee80211_hw *dev) | |||
445 | struct ieee80211_rx_status rx_status = {0}; | 445 | struct ieee80211_rx_status rx_status = {0}; |
446 | 446 | ||
447 | if (priv->pdev->revision < ADM8211_REV_CA) | 447 | if (priv->pdev->revision < ADM8211_REV_CA) |
448 | rx_status.ssi = rssi; | 448 | rx_status.signal = rssi; |
449 | else | 449 | else |
450 | rx_status.ssi = 100 - rssi; | 450 | rx_status.signal = 100 - rssi; |
451 | 451 | ||
452 | rx_status.rate_idx = rate; | 452 | rx_status.rate_idx = rate; |
453 | 453 | ||
@@ -1893,9 +1893,10 @@ static int __devinit adm8211_probe(struct pci_dev *pdev, | |||
1893 | 1893 | ||
1894 | dev->extra_tx_headroom = sizeof(struct adm8211_tx_hdr); | 1894 | dev->extra_tx_headroom = sizeof(struct adm8211_tx_hdr); |
1895 | /* dev->flags = IEEE80211_HW_RX_INCLUDES_FCS in promisc mode */ | 1895 | /* dev->flags = IEEE80211_HW_RX_INCLUDES_FCS in promisc mode */ |
1896 | dev->flags = IEEE80211_HW_SIGNAL_UNSPEC; | ||
1896 | 1897 | ||
1897 | dev->channel_change_time = 1000; | 1898 | dev->channel_change_time = 1000; |
1898 | dev->max_rssi = 100; /* FIXME: find better value */ | 1899 | dev->max_signal = 100; /* FIXME: find better value */ |
1899 | 1900 | ||
1900 | dev->queues = 1; /* ADM8211C supports more, maybe ADM8211B too */ | 1901 | dev->queues = 1; /* ADM8211C supports more, maybe ADM8211B too */ |
1901 | 1902 | ||