diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 00:52:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 00:52:37 -0700 |
| commit | f42a44494bcdf03fc851c03d438464d59c0ceaf5 (patch) | |
| tree | 986ea7b54e9fc79a64863fd7e92eabd99ffd37a3 /drivers/net/wireless/b43/xmit.c | |
| parent | 63fe46da9c380b3f2bbdf3765044649517cc717c (diff) | |
| parent | ef85ad541f9a6ccd3f89ec73f92b2d6f45a9d3e8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43/xmit.c')
| -rw-r--r-- | drivers/net/wireless/b43/xmit.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index 88491947a20..afce9338d83 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c @@ -581,12 +581,11 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) // and also find out what the maximum possible value is. // Fill status.ssi and status.signal fields. } else { - status.ssi = b43_rssi_postprocess(dev, rxhdr->jssi, + status.signal = b43_rssi_postprocess(dev, rxhdr->jssi, (phystat0 & B43_RX_PHYST0_OFDM), (phystat0 & B43_RX_PHYST0_GAINCTL), (phystat3 & B43_RX_PHYST3_TRSTATE)); - /* the next line looks wrong, but is what mac80211 wants */ - status.signal = (rxhdr->jssi * 100) / B43_RX_MAX_SSI; + status.qual = (rxhdr->jssi * 100) / B43_RX_MAX_SSI; } if (phystat0 & B43_RX_PHYST0_OFDM) |