diff options
author | Vlad Yasevich <vyasevic@redhat.com> | 2013-04-02 17:10:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-05 00:18:46 -0400 |
commit | 4543fbefe6e06a9e40d9f2b28d688393a299f079 (patch) | |
tree | be52f567c2f791b4328f75bee9cecaf022ed6a35 /net | |
parent | e2409d83434d77874b461b78af6a19cd6e6a1280 (diff) | |
download | op-kernel-dev-4543fbefe6e06a9e40d9f2b28d688393a299f079.zip op-kernel-dev-4543fbefe6e06a9e40d9f2b28d688393a299f079.tar.gz |
net: count hw_addr syncs so that unsync works properly.
A few drivers use dev_uc_sync/unsync to synchronize the
address lists from master down to slave/lower devices. In
some cases (bond/team) a single address list is synched down
to multiple devices. At the time of unsync, we have a leak
in these lower devices, because "synced" is treated as a
boolean and the address will not be unsynced for anything after
the first device/call.
Treat "synced" as a count (same as refcount) and allow all
unsync calls to work.
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/dev_addr_lists.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c index bd2eb9d..abdc9e6 100644 --- a/net/core/dev_addr_lists.c +++ b/net/core/dev_addr_lists.c @@ -37,7 +37,7 @@ static int __hw_addr_create_ex(struct netdev_hw_addr_list *list, ha->type = addr_type; ha->refcount = 1; ha->global_use = global; - ha->synced = false; + ha->synced = 0; list_add_tail_rcu(&ha->list, &list->list); list->count++; @@ -165,7 +165,7 @@ int __hw_addr_sync(struct netdev_hw_addr_list *to_list, addr_len, ha->type); if (err) break; - ha->synced = true; + ha->synced++; ha->refcount++; } else if (ha->refcount == 1) { __hw_addr_del(to_list, ha->addr, addr_len, ha->type); @@ -186,7 +186,7 @@ void __hw_addr_unsync(struct netdev_hw_addr_list *to_list, if (ha->synced) { __hw_addr_del(to_list, ha->addr, addr_len, ha->type); - ha->synced = false; + ha->synced--; __hw_addr_del(from_list, ha->addr, addr_len, ha->type); } |