mac80211: Convert compare_ether_addr to ether_addr_equal by hand

spatch/coccinelle isn't perfect.  It doesn't understand
__aligned(x) and doesn't convert functions it can't parse.

Convert the remaining compare_ether_addr uses.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 26bfd6fcaa48beb9d9d8f23e98293d3b2e3b9df2..d722c40c7eca4c71b180c548779ee5ff9cc24c78 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1714,8 +1714,8 @@ static bool ieee80211_frame_allowed(struct ieee80211_rx_data *rx, __le16 fc)
         * of whether the frame was encrypted or not.
         */
        if (ehdr->h_proto == rx->sdata->control_port_protocol &&
-           (compare_ether_addr(ehdr->h_dest, rx->sdata->vif.addr) == 0 ||
-            compare_ether_addr(ehdr->h_dest, pae_group_addr) == 0))
+           (ether_addr_equal(ehdr->h_dest, rx->sdata->vif.addr) ||
+            ether_addr_equal(ehdr->h_dest, pae_group_addr)))
                return true;
 
        if (ieee80211_802_1x_port_control(rx) ||

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index f75f5d9ac06d9491de6b74e674ed0dbd80cac4c3..e920b229fb8cf19598add63cda00dc42c35f8bdb 100644 (file)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -501,7 +501,7 @@ void for_each_sta_info_type_check(struct ieee80211_local *local,
                nxt = _sta ? rcu_dereference(_sta->hnext) : NULL        \
             )                                                          \
        /* compare address and run code only if it matches */           \
-       if (compare_ether_addr(_sta->sta.addr, (_addr)) == 0)
+       if (ether_addr_equal(_sta->sta.addr, (_addr)))
 
 /*
  * Get STA info by index, BROKEN!