diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2006-09-25 16:33:20 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-12-02 00:11:56 -0500 |
commit | f04e2be7d9b73a1da7be99a08b3695074e14970c (patch) | |
tree | 8b0d85daac4b3c157dc9d9556ee508f4a2bf04b9 /drivers/net | |
parent | 3470cb1d4fb27572273079e7095734ac4f9caa43 (diff) |
[PATCH] bcm43xx: output proper link quality with scans
The bcm43xx-softmac driver fails to set two quantities needed for
iwlist to compute wireless quality when scanning. As a result, userland
programs using the quality to determine the best connection fail.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_main.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h index d6a8bf09878e..5f43d7f42af1 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx.h +++ b/drivers/net/wireless/bcm43xx/bcm43xx.h | |||
@@ -365,6 +365,9 @@ | |||
365 | #define BCM43xx_DEFAULT_SHORT_RETRY_LIMIT 7 | 365 | #define BCM43xx_DEFAULT_SHORT_RETRY_LIMIT 7 |
366 | #define BCM43xx_DEFAULT_LONG_RETRY_LIMIT 4 | 366 | #define BCM43xx_DEFAULT_LONG_RETRY_LIMIT 4 |
367 | 367 | ||
368 | /* FIXME: the next line is a guess as to what the maximum RSSI value might be */ | ||
369 | #define RX_RSSI_MAX 60 | ||
370 | |||
368 | /* Max size of a security key */ | 371 | /* Max size of a security key */ |
369 | #define BCM43xx_SEC_KEYSIZE 16 | 372 | #define BCM43xx_SEC_KEYSIZE 16 |
370 | /* Security algorithms. */ | 373 | /* Security algorithms. */ |
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index a1b783813d8e..2ffc0d5b54ee 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c | |||
@@ -3688,6 +3688,8 @@ static int bcm43xx_read_phyinfo(struct bcm43xx_private *bcm) | |||
3688 | phy_type); | 3688 | phy_type); |
3689 | return -ENODEV; | 3689 | return -ENODEV; |
3690 | }; | 3690 | }; |
3691 | bcm->ieee->perfect_rssi = RX_RSSI_MAX; | ||
3692 | bcm->ieee->worst_rssi = 0; | ||
3691 | if (!phy_rev_ok) { | 3693 | if (!phy_rev_ok) { |
3692 | printk(KERN_WARNING PFX "Invalid PHY Revision %x\n", | 3694 | printk(KERN_WARNING PFX "Invalid PHY Revision %x\n", |
3693 | phy_rev); | 3695 | phy_rev); |
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c index d27016f8c736..12043f8be1bf 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c | |||
@@ -47,9 +47,6 @@ | |||
47 | #define BCM43xx_WX_VERSION 18 | 47 | #define BCM43xx_WX_VERSION 18 |
48 | 48 | ||
49 | #define MAX_WX_STRING 80 | 49 | #define MAX_WX_STRING 80 |
50 | /* FIXME: the next line is a guess as to what the maximum RSSI value might be */ | ||
51 | #define RX_RSSI_MAX 60 | ||
52 | |||
53 | 50 | ||
54 | static int bcm43xx_wx_get_name(struct net_device *net_dev, | 51 | static int bcm43xx_wx_get_name(struct net_device *net_dev, |
55 | struct iw_request_info *info, | 52 | struct iw_request_info *info, |