From: Hagen Paul Pfeifer Date: Fri, 25 Feb 2011 21:58:54 +0000 (-0800) Subject: net: handle addr_type of 0 properly X-Git-Tag: Ubuntu-5.0.0-8.9~19948^2~31 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5aca1a9e880e06bb7e5fd553a86a330ae7e218b5;p=mirror_ubuntu-disco-kernel.git net: handle addr_type of 0 properly addr_type of 0 means that the type should be adopted from from_dev and not from __hw_addr_del_multiple(). Unfortunately it isn't so and addr_type will always be considered. Fix this by implementing the considered and documented behavior. Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller --- diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c index 508f9c18992f..133fd22ea287 100644 --- a/net/core/dev_addr_lists.c +++ b/net/core/dev_addr_lists.c @@ -144,7 +144,7 @@ void __hw_addr_del_multiple(struct netdev_hw_addr_list *to_list, list_for_each_entry(ha, &from_list->list, list) { type = addr_type ? addr_type : ha->type; - __hw_addr_del(to_list, ha->addr, addr_len, addr_type); + __hw_addr_del(to_list, ha->addr, addr_len, type); } } EXPORT_SYMBOL(__hw_addr_del_multiple);