Skip to content

Commit

Permalink
net,rcu: convert call_rcu(ha_rcu_free) to kfree_rcu()
Browse files Browse the repository at this point in the history
The rcu callback ha_rcu_free() just calls a kfree(),
so we use kfree_rcu() instead of the call_rcu(ha_rcu_free).

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
  • Loading branch information
Lai Jiangshan authored and Paul E. McKenney committed May 8, 2011
1 parent 1231f0b commit 217f186
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions net/core/dev_addr_lists.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,6 @@ static int __hw_addr_add(struct netdev_hw_addr_list *list, unsigned char *addr,
return __hw_addr_add_ex(list, addr, addr_len, addr_type, false);
}

static void ha_rcu_free(struct rcu_head *head)
{
struct netdev_hw_addr *ha;

ha = container_of(head, struct netdev_hw_addr, rcu_head);
kfree(ha);
}

static int __hw_addr_del_ex(struct netdev_hw_addr_list *list,
unsigned char *addr, int addr_len,
unsigned char addr_type, bool global)
Expand All @@ -94,7 +86,7 @@ static int __hw_addr_del_ex(struct netdev_hw_addr_list *list,
if (--ha->refcount)
return 0;
list_del_rcu(&ha->list);
call_rcu(&ha->rcu_head, ha_rcu_free);
kfree_rcu(ha, rcu_head);
list->count--;
return 0;
}
Expand Down Expand Up @@ -197,7 +189,7 @@ void __hw_addr_flush(struct netdev_hw_addr_list *list)

list_for_each_entry_safe(ha, tmp, &list->list, list) {
list_del_rcu(&ha->list);
call_rcu(&ha->rcu_head, ha_rcu_free);
kfree_rcu(ha, rcu_head);
}
list->count = 0;
}
Expand Down

0 comments on commit 217f186

Please sign in to comment.