diff --git a/[refs] b/[refs] index 6f0fd7fa1d74..4d616461f562 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7a57e762ecf5d9971549ab3f9eb66b559840e72 +refs/heads/master: 5b346f3eb4b59e00fbaca51637f2cf1df3f47f9d diff --git a/trunk/drivers/net/wireless/b43/xmit.c b/trunk/drivers/net/wireless/b43/xmit.c index 5f812d1d6d0e..b8de62c22479 100644 --- a/trunk/drivers/net/wireless/b43/xmit.c +++ b/trunk/drivers/net/wireless/b43/xmit.c @@ -735,13 +735,11 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) } /* Link quality statistics */ - if ((chanstat & B43_RX_CHAN_PHYTYPE) >= B43_PHYTYPE_N) { - /* - s8 rssi = max(rxhdr->power0, rxhdr->power1); - TODO: Find out what the rssi value is (dBm or percentage?) - and also find out what the maximum possible value is. - Fill status.ssi and status.signal fields. - */ + if ((chanstat & B43_RX_CHAN_PHYTYPE) == B43_PHYTYPE_N) { +// s8 rssi = max(rxhdr->power0, rxhdr->power1); + //TODO: Find out what the rssi value is (dBm or percentage?) + // and also find out what the maximum possible value is. + // Fill status.ssi and status.signal fields. } else { status.signal = b43_rssi_postprocess(dev, rxhdr->jssi, (phystat0 & B43_RX_PHYST0_OFDM),