diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2012-11-14 02:51:04 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-12-06 11:20:12 +0000 |
| commit | ff5d468a3f897811682442ae2a0e6b303679d8a6 (patch) | |
| tree | 49e947de2072fddf91b6d1caf3be11f04b156767 /net/core/dev_addr_lists.c | |
| parent | edd265dc3128ce255654440b6bdf518dbe6325fd (diff) | |
| download | kernel_samsung_smdk4412-ff5d468a3f897811682442ae2a0e6b303679d8a6.zip kernel_samsung_smdk4412-ff5d468a3f897811682442ae2a0e6b303679d8a6.tar.gz kernel_samsung_smdk4412-ff5d468a3f897811682442ae2a0e6b303679d8a6.tar.bz2 | |
net: correct check in dev_addr_del()
[ Upstream commit a652208e0b52c190e57f2a075ffb5e897fe31c3b ]
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/core/dev_addr_lists.c')
| -rw-r--r-- | net/core/dev_addr_lists.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c index 277faef..0387da0 100644 --- a/net/core/dev_addr_lists.c +++ b/net/core/dev_addr_lists.c @@ -308,7 +308,8 @@ int dev_addr_del(struct net_device *dev, 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, |