]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: correct check in dev_addr_del()
authorJiri Pirko <jiri@resnulli.us>
Wed, 14 Nov 2012 02:51:04 +0000 (02:51 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 Nov 2012 22:57:53 +0000 (17:57 -0500)
Check (ha->addr == dev->dev_addr) is always true because dev_addr_init()
sets this. Correct the check to behave properly on addr removal.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev_addr_lists.c

index 87cc17db2d566e5846601d6eb03ba38ce64b2ddb..b079c7bbc157a3c047db12e7a39595da380071e8 100644 (file)
@@ -319,7 +319,8 @@ int dev_addr_del(struct net_device *dev, const unsigned char *addr,
         */
        ha = list_first_entry(&dev->dev_addrs.list,
                              struct netdev_hw_addr, list);
-       if (ha->addr == dev->dev_addr && ha->refcount == 1)
+       if (!memcmp(ha->addr, addr, dev->addr_len) &&
+           ha->type == addr_type && ha->refcount == 1)
                return -ENOENT;
 
        err = __hw_addr_del(&dev->dev_addrs, addr, dev->addr_len,