From 0a0414ece1cda28adc893e77f6737693e791f5b8 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 19 Dec 2007 19:20:12 -0500 Subject: [PATCH] --- yaml --- r: 79335 b: refs/heads/master c: 851b3e5e3de0feea7bfee634f99a940648de58c8 h: refs/heads/master i: 79333: 2c3f8a952daa5347fed1729c32211a822da1e608 79331: 9f61f2a79437cbfe350ecff8d9e2b068e57c6e6a 79327: 5a7b0e3fdce42453d8cdb16106fdd071a576d79a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/airo.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9fa10cb2b201..3d0e983a4fe4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 977b143c13e685081625704ac356b741d71c6a73 +refs/heads/master: 851b3e5e3de0feea7bfee634f99a940648de58c8 diff --git a/trunk/drivers/net/wireless/airo.c b/trunk/drivers/net/wireless/airo.c index 24fa0d62efe4..6d4cc684afa6 100644 --- a/trunk/drivers/net/wireless/airo.c +++ b/trunk/drivers/net/wireless/airo.c @@ -7239,6 +7239,7 @@ static inline char *airo_translate_scan(struct net_device *dev, char * current_val; /* For rates */ int i; char * buf; + u16 dBm; /* First entry *MUST* be the AP MAC address */ iwe.cmd = SIOCGIWAP; @@ -7277,16 +7278,18 @@ static inline char *airo_translate_scan(struct net_device *dev, iwe.u.freq.e = 1; current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_FREQ_LEN); + dBm = le16_to_cpu(bss->dBm); + /* Add quality statistics */ iwe.cmd = IWEVQUAL; if (ai->rssi) { - iwe.u.qual.level = 0x100 - bss->dBm; - iwe.u.qual.qual = airo_dbm_to_pct( ai->rssi, bss->dBm ); + iwe.u.qual.level = 0x100 - dBm; + iwe.u.qual.qual = airo_dbm_to_pct(ai->rssi, dBm); iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED | IW_QUAL_DBM; } else { - iwe.u.qual.level = (bss->dBm + 321) / 2; + iwe.u.qual.level = (dBm + 321) / 2; iwe.u.qual.qual = 0; iwe.u.qual.updated = IW_QUAL_QUAL_INVALID | IW_QUAL_LEVEL_UPDATED