Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / net / mac80211 / iface.c

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 0aa9675319ef18beac12b7eca0290f2f15e27109..3dfd20a453aba250fff726d1733f0dac6c763b3c 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1045,7 +1045,8 @@ static void ieee80211_uninit(struct net_device *dev)
 }
 
 static u16 ieee80211_netdev_select_queue(struct net_device *dev,
-                                        struct sk_buff *skb)
+                                        struct sk_buff *skb,
+                                        void *accel_priv)
 {
        return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
 }
@@ -1062,7 +1063,8 @@ static const struct net_device_ops ieee80211_dataif_ops = {
 };
 
 static u16 ieee80211_monitor_select_queue(struct net_device *dev,
-                                         struct sk_buff *skb)
+                                         struct sk_buff *skb,
+                                         void *accel_priv)
 {
        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
        struct ieee80211_local *local = sdata->local;
@@ -1480,8 +1482,8 @@ static void ieee80211_assign_perm_addr(struct ieee80211_local *local,
                        bool used = false;
 
                        list_for_each_entry(sdata, &local->interfaces, list) {
-                               if (memcmp(local->hw.wiphy->addresses[i].addr,
-                                          sdata->vif.addr, ETH_ALEN) == 0) {
+                               if (ether_addr_equal(local->hw.wiphy->addresses[i].addr,
+                                                    sdata->vif.addr)) {
                                        used = true;
                                        break;
                                }
@@ -1541,8 +1543,7 @@ static void ieee80211_assign_perm_addr(struct ieee80211_local *local,
                        val += inc;
 
                        list_for_each_entry(sdata, &local->interfaces, list) {
-                               if (memcmp(tmp_addr, sdata->vif.addr,
-                                                       ETH_ALEN) == 0) {
+                               if (ether_addr_equal(tmp_addr, sdata->vif.addr)) {
                                        used = true;
                                        break;
                                }