diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-05 22:09:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-05 22:09:56 -0800 |
| commit | 0a0755c9fe47dc9f8271935909c66096e43efbfe (patch) | |
| tree | dd24b9a654f96742a3600d6735c81950ef16dc39 /drivers/net/wireless/zd1211rw/zd_mac.c | |
| parent | a6af2d6ba5797c556fba0cd3a19e5f3bc9a99b76 (diff) | |
| parent | cde6901b7b69557a6f90f3183f76eda581af015e (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index fe1867b25ff7..cac732f4047f 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c @@ -615,7 +615,7 @@ static int filter_ack(struct ieee80211_hw *hw, struct ieee80211_hdr *rx_hdr, struct ieee80211_hdr *tx_hdr; tx_hdr = (struct ieee80211_hdr *)skb->data; - if (likely(!compare_ether_addr(tx_hdr->addr2, rx_hdr->addr1))) + if (likely(!memcmp(tx_hdr->addr2, rx_hdr->addr1, ETH_ALEN))) { __skb_unlink(skb, q); tx_status(hw, skb, IEEE80211_TX_STAT_ACK, stats->signal, 1); |