Author: matkor Date: Thu Oct 19 05:14:40 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- Release 4. One more bcm43xx fix.
---- Files affected:
SOURCES:
kernel-bcm43xx-patch_2.6.18.1_signal_quality.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/kernel-bcm43xx-patch_2.6.18.1_signal_quality.patch
diff -u /dev/null SOURCES/kernel-bcm43xx-patch_2.6.18.1_signal_quality.patch:1.1
--- /dev/null Thu Oct 19 07:14:40 2006
+++ SOURCES/kernel-bcm43xx-patch_2.6.18.1_signal_quality.patch Thu Oct 19
07:14:35 2006
@@ -0,0 +1,138 @@
+Index: linux-2.6.18/drivers/net/wireless/bcm43xx/bcm43xx.h
+===================================================================
+--- linux-2.6.18.orig/drivers/net/wireless/bcm43xx/bcm43xx.h
++++ linux-2.6.18/drivers/net/wireless/bcm43xx/bcm43xx.h
+@@ -365,6 +365,9 @@
+ #define BCM43xx_DEFAULT_SHORT_RETRY_LIMIT 7
+ #define BCM43xx_DEFAULT_LONG_RETRY_LIMIT 4
+
++/* FIXME: the next line is a guess as to what the maximum RSSI value might be
*/
++#define RX_RSSI_MAX 60
++
+ /* Max size of a security key */
+ #define BCM43xx_SEC_KEYSIZE 16
+ /* Security algorithms. */
+Index: linux-2.6.18/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+===================================================================
+--- linux-2.6.18.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c
++++ linux-2.6.18/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+@@ -3647,6 +3647,8 @@ static int bcm43xx_read_phyinfo(struct b
+ phy_type);
+ return -ENODEV;
+ };
++ bcm->ieee->perfect_rssi = RX_RSSI_MAX;
++ bcm->ieee->worst_rssi = 0;
+ if (!phy_rev_ok) {
+ printk(KERN_WARNING PFX "Invalid PHY Revision %x\n",
+ phy_rev);
+Index: linux-2.6.18/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+===================================================================
+--- linux-2.6.18.orig/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
++++ linux-2.6.18/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+@@ -48,7 +48,6 @@
+
+ #define MAX_WX_STRING 80
+
+-
+ static int bcm43xx_wx_get_name(struct net_device *net_dev,
+ struct iw_request_info *info,
+ union iwreq_data *data,
+@@ -227,15 +226,14 @@ static int bcm43xx_wx_get_rangeparams(st
+ range->throughput = 27 * 1000 * 1000;
+
+ range->max_qual.qual = 100;
+- /* TODO: Real max RSSI */
+- range->max_qual.level = 3;
+- range->max_qual.noise = 100;
+- range->max_qual.updated = 7;
+-
+- range->avg_qual.qual = 70;
+- range->avg_qual.level = 2;
+- range->avg_qual.noise = 40;
+- range->avg_qual.updated = 7;
++ range->max_qual.level = 146; /* set floor at -110 dBm (146 - 256) */
++ range->max_qual.noise = 146;
++ range->max_qual.updated = IW_QUAL_ALL_UPDATED;
++
++ range->avg_qual.qual = 50;
++ range->avg_qual.level = 0;
++ range->avg_qual.noise = 0;
++ range->avg_qual.updated = IW_QUAL_ALL_UPDATED;
+
+ range->min_rts = BCM43xx_MIN_RTS_THRESHOLD;
+ range->max_rts = BCM43xx_MAX_RTS_THRESHOLD;
+@@ -840,6 +838,10 @@ static struct iw_statistics *bcm43xx_get
+ struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+ struct ieee80211softmac_device *mac = ieee80211_priv(net_dev);
+ struct iw_statistics *wstats;
++ struct ieee80211_network *network = NULL;
++ static int tmp_level = 0;
++ static int tmp_qual = 0;
++ unsigned long flags;
+
+ wstats = &bcm->stats.wstats;
+ if (!mac->associated) {
+@@ -857,16 +859,28 @@ static struct iw_statistics *bcm43xx_get
+ 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;
++ wstats->qual.updated |= IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
+ 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;
++ spin_lock_irqsave(&mac->ieee->lock, flags);
++ list_for_each_entry(network, &mac->ieee->network_list, list) {
++ if (!memcmp(mac->associnfo.bssid, network->bssid, ETH_ALEN)) {
++ if (!tmp_level) { /* get initial values */
++ tmp_level = network->stats.signal;
++ tmp_qual = network->stats.rssi;
++ } else { /* smooth results */
++ tmp_level = (15 * tmp_level +
network->stats.signal)/16;
++ tmp_qual = (15 * tmp_qual +
network->stats.rssi)/16;
++ }
++ break;
++ }
++ }
++ spin_unlock_irqrestore(&mac->ieee->lock, flags);
++ wstats->qual.level = tmp_level;
++ wstats->qual.qual = 100 * tmp_qual / RX_RSSI_MAX;
+ wstats->qual.noise = bcm->stats.noise;
+- wstats->qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED |
+- IW_QUAL_NOISE_UPDATED;
++ wstats->qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
+ 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;
+Index: linux-2.6.18/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
+===================================================================
+--- linux-2.6.18.orig/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
++++ linux-2.6.18/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
+@@ -492,20 +492,18 @@ int bcm43xx_rx(struct bcm43xx_private *b
+
+ memset(&stats, 0, sizeof(stats));
+ stats.mac_time = le16_to_cpu(rxhdr->mactime);
+- stats.rssi = bcm43xx_rssi_postprocess(bcm, rxhdr->rssi, is_ofdm,
++ stats.rssi = rxhdr->rssi;
++ stats.signal = bcm43xx_rssi_postprocess(bcm, rxhdr->rssi, is_ofdm,
+ !!(rxflags1 &
BCM43xx_RXHDR_FLAGS1_2053RSSIADJ),
+ !!(rxflags3 &
BCM43xx_RXHDR_FLAGS3_2050RSSIADJ));
+- stats.signal = rxhdr->signal_quality; //FIXME
+-//TODO stats.noise =
++ stats.noise = bcm->stats.noise;
+ if (is_ofdm)
+ stats.rate = bcm43xx_plcp_get_bitrate_ofdm(plcp);
+ else
+ stats.rate = bcm43xx_plcp_get_bitrate_cck(plcp);
+-//printk("RX ofdm %d, rate == %u\n", is_ofdm, stats.rate);
+ stats.received_channel = radio->channel;
+-//TODO stats.control =
+ stats.mask = IEEE80211_STATMASK_SIGNAL |
+-//TODO IEEE80211_STATMASK_NOISE |
++ IEEE80211_STATMASK_NOISE |
+ IEEE80211_STATMASK_RATE |
+ IEEE80211_STATMASK_RSSI;
+ if (phy->type == BCM43xx_PHYTYPE_A)
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
