[PATCH] zd1211rw: Use compare_ether_addr()

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

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 4c5f78eac349a4f77d5d897a9936618c0dc562a3..19172f571524734df56cc0a8f13fa2c33560143c 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/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,7 @@ 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);