← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to net/8021q/vlan_dev.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/8021q/vlan_dev.c
277
277
            !(vlan->flags & VLAN_FLAG_LOOSE_BINDING))
278
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
281
                err = dev_uc_add(real_dev, dev->dev_addr);
282
282
                if (err < 0)
283
283
                        goto out;
307
307
        if (dev->flags & IFF_ALLMULTI)
308
308
                dev_set_allmulti(real_dev, -1);
309
309
del_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
311
                dev_uc_del(real_dev, dev->dev_addr);
312
312
out:
313
313
        netif_carrier_off(dev);
326
326
        if (dev->flags & IFF_PROMISC)
327
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
330
                dev_uc_del(real_dev, dev->dev_addr);
331
331
 
332
332
        netif_carrier_off(dev);
345
345
        if (!(dev->flags & IFF_UP))
346
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
349
                err = dev_uc_add(real_dev, addr->sa_data);
350
350
                if (err < 0)
351
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
355
                dev_uc_del(real_dev, dev->dev_addr);
356
356
 
357
357
out: