[PATCH] zd1211rw-mac80211: Use compare_ether_addr()

[Daniel Drake]

Suggested by Maxime Austruy, based on mac80211 changes from Stephen
Hemminger

Signed-off-by: Daniel Drake <[EMAIL PROTECTED]>
---
 drivers/net/wireless/zd1211rw/zd_mac.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c 
b/drivers/net/wireless/zd1211rw/zd_mac.c
index 4c5f78e..af5ca04 100644
--- a/drivers/net/wireless/zd1211rw/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -974,14 +974,14 @@ static int is_data_packet_for_us(struct ieee80211_device 
*ieee,
        switch (ieee->iw_mode) {
        case IW_MODE_ADHOC:
                if ((fc & (IEEE80211_FCTL_TODS|IEEE80211_FCTL_FROMDS)) != 0 ||
-                   memcmp(hdr->addr3, ieee->bssid, ETH_ALEN) != 0)
+                   compare_ether_addr(hdr->addr3, ieee->bssid) != 0)
                        return 0;
                break;
        case IW_MODE_AUTO:
        case IW_MODE_INFRA:
                if ((fc & (IEEE80211_FCTL_TODS|IEEE80211_FCTL_FROMDS)) !=
                    IEEE80211_FCTL_FROMDS ||
-                   memcmp(hdr->addr2, ieee->bssid, ETH_ALEN) != 0)
+                   compare_ether_addr(hdr->addr2, ieee->bssid) != 0)
                        return 0;
                break;
        default:
@@ -989,9 +989,9 @@ static int is_data_packet_for_us(struct ieee80211_device 
*ieee,
                return 0;
        }
 
-       return memcmp(hdr->addr1, netdev->dev_addr, ETH_ALEN) == 0 ||
+       return compare_ether_addr(hdr->addr1, netdev->dev_addr) == 0 ||
               (is_multicast_ether_addr(hdr->addr1) &&
-               memcmp(hdr->addr3, netdev->dev_addr, ETH_ALEN) != 0) ||
+               compare_ether_addr(hdr->addr3, netdev->dev_addr) != 0) ||
               (netdev->flags & IFF_PROMISC);
 }
 
@@ -1047,7 +1047,8 @@ static void update_qual_rssi(struct zd_mac *mac,
        hdr = (struct ieee80211_hdr_3addr *)buffer;
        if (length < offsetof(struct ieee80211_hdr_3addr, addr3))
                return;
-       if (memcmp(hdr->addr2, zd_mac_to_ieee80211(mac)->bssid, ETH_ALEN) != 0)
+       if (compare_ether_addr(hdr->addr2,
+           zd_mac_to_ieee80211(mac)->bssid) != 0)
                return;
 
        spin_lock_irqsave(&mac->lock, flags);
-- 
1.5.0.3

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html