1 files changed, 7 insertions, 16 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 4c5f78eac349..6753d240c168 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -156,17 +156,8 @@ void zd_mac_clear(struct zd_mac *mac)
 static int reset_mode(struct zd_mac *mac)
 {
         struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
-        struct zd_ioreq32 ioreqs[] = {
-                { CR_RX_FILTER, STA_RX_FILTER },
-                { CR_SNIFFER_ON, 0U },
-        };
-
-        if (ieee->iw_mode == IW_MODE_MONITOR) {
-                ioreqs[0].value = 0xffffffff;
-                ioreqs[1].value = 0x1;
-        }
-
-        return zd_iowrite32a(&mac->chip, ioreqs, ARRAY_SIZE(ioreqs));
+        u32 filter = (ieee->iw_mode == IW_MODE_MONITOR) ? ~0 : STA_RX_FILTER;
+        return zd_iowrite32(&mac->chip, CR_RX_FILTER, filter);
 }
 
 int zd_mac_open(struct net_device *netdev)
@@ -974,14 +965,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 +980,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 +1038,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);