aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q/vlan_dev.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/8021q/vlan_dev.c')
-rw-r--r--net/8021q/vlan_dev.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 9757c193c86b..da1bc9c3cf38 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -277,7 +277,7 @@ static int vlan_dev_open(struct net_device *dev)
277 !(vlan->flags & VLAN_FLAG_LOOSE_BINDING)) 277 !(vlan->flags & VLAN_FLAG_LOOSE_BINDING))
278 return -ENETDOWN; 278 return -ENETDOWN;
279 279
280 if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) { 280 if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr)) {
281 err = dev_uc_add(real_dev, dev->dev_addr); 281 err = dev_uc_add(real_dev, dev->dev_addr);
282 if (err < 0) 282 if (err < 0)
283 goto out; 283 goto out;
@@ -307,7 +307,7 @@ clear_allmulti:
307 if (dev->flags & IFF_ALLMULTI) 307 if (dev->flags & IFF_ALLMULTI)
308 dev_set_allmulti(real_dev, -1); 308 dev_set_allmulti(real_dev, -1);
309del_unicast: 309del_unicast:
310 if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) 310 if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr))
311 dev_uc_del(real_dev, dev->dev_addr); 311 dev_uc_del(real_dev, dev->dev_addr);
312out: 312out:
313 netif_carrier_off(dev); 313 netif_carrier_off(dev);
@@ -326,7 +326,7 @@ static int vlan_dev_stop(struct net_device *dev)
326 if (dev->flags & IFF_PROMISC) 326 if (dev->flags & IFF_PROMISC)
327 dev_set_promiscuity(real_dev, -1); 327 dev_set_promiscuity(real_dev, -1);
328 328
329 if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) 329 if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr))
330 dev_uc_del(real_dev, dev->dev_addr); 330 dev_uc_del(real_dev, dev->dev_addr);
331 331
332 netif_carrier_off(dev); 332 netif_carrier_off(dev);
@@ -345,13 +345,13 @@ static int vlan_dev_set_mac_address(struct net_device *dev, void *p)
345 if (!(dev->flags & IFF_UP)) 345 if (!(dev->flags & IFF_UP))
346 goto out; 346 goto out;
347 347
348 if (compare_ether_addr(addr->sa_data, real_dev->dev_addr)) { 348 if (!ether_addr_equal(addr->sa_data, real_dev->dev_addr)) {
349 err = dev_uc_add(real_dev, addr->sa_data); 349 err = dev_uc_add(real_dev, addr->sa_data);
350 if (err < 0) 350 if (err < 0)
351 return err; 351 return err;
352 } 352 }
353 353
354 if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) 354 if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr))
355 dev_uc_del(real_dev, dev->dev_addr); 355 dev_uc_del(real_dev, dev->dev_addr);
356 356
357out: 357out: