aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/zd1211rw/zd_mac.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-29 19:44:25 -0800
committerDavid S. Miller <davem@davemloft.net>2009-12-29 19:44:25 -0800
commit7f9d3577e2603ca279c3176b696eba392f21cbe2 (patch)
treee2135eddba600910cdebb54c8b01de53473ecefb /drivers/net/wireless/zd1211rw/zd_mac.c
parentNET: XFRM: Fix spelling of neighbour. (diff)
parentRevert "b43: Enforce DMA descriptor memory constraints" (diff)
downloadlinux-dev-7f9d3577e2603ca279c3176b696eba392f21cbe2.tar.xz
linux-dev-7f9d3577e2603ca279c3176b696eba392f21cbe2.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_mac.c')
-rw-r--r--drivers/net/wireless/zd1211rw/zd_mac.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index cf51e8f8174b..8ebf5c33955d 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -828,9 +828,6 @@ int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer, unsigned int length)
stats.freq = zd_channels[_zd_chip_get_channel(&mac->chip) - 1].center_freq;
stats.band = IEEE80211_BAND_2GHZ;
stats.signal = status->signal_strength;
- stats.qual = zd_rx_qual_percent(buffer,
- length - sizeof(struct rx_status),
- status);
rate = zd_rx_rate(buffer, status);