diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-09-02 19:30:07 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-02 19:30:07 +0200 |
| commit | 78ab952717b62c0ba6ca7f7a27eaa0486685e45f (patch) | |
| tree | a4ab2bfc578f279fc6847031f501d84c75057531 /drivers/net/wireless/p54/txrx.c | |
| parent | starfire: Temporary kludge to fix powerpc build. (diff) | |
| parent | mac80211: only cancel software-based scans on suspend (diff) | |
| download | linux-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.tar.xz linux-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/p54/txrx.c')
| -rw-r--r-- | drivers/net/wireless/p54/txrx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c index 34447d1ad80d..8f67db487f57 100644 --- a/drivers/net/wireless/p54/txrx.c +++ b/drivers/net/wireless/p54/txrx.c @@ -275,15 +275,15 @@ static int p54_rssi_to_dbm(struct p54_common *priv, int rssi) { int band = priv->hw->conf.channel->band; - if (priv->rxhw != 5) + if (priv->rxhw != 5) { return ((rssi * priv->rssical_db[band].mul) / 64 + priv->rssical_db[band].add) / 4; - else + } else { /* * TODO: find the correct formula */ - return ((rssi * priv->rssical_db[band].mul) / 64 + - priv->rssical_db[band].add) / 4; + return rssi / 2 - 110; + } } /* |