diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2010-06-07 03:36:29 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-08 06:25:20 +0200 |
| commit | 8b37ef0a1f6c2401fea3536facfa21191936bd6c (patch) | |
| tree | 57c0933abf47485aa22d94bb3810341a9702b03b /drivers/net/macvlan.c | |
| parent | net: Remove unnecessary net action assertion (diff) | |
| download | linux-8b37ef0a1f6c2401fea3536facfa21191936bd6c.tar.xz linux-8b37ef0a1f6c2401fea3536facfa21191936bd6c.zip | |
macvlan: use call_rcu for port free
Use call_rcu rather than synchronize_rcu.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
| -rw-r--r-- | drivers/net/macvlan.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 53422ce26f7f..59c315556a30 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -37,6 +37,7 @@ struct macvlan_port { struct net_device *dev; struct hlist_head vlan_hash[MACVLAN_HASH_SIZE]; struct list_head vlans; + struct rcu_head rcu; }; static struct macvlan_dev *macvlan_hash_lookup(const struct macvlan_port *port, @@ -540,14 +541,21 @@ static int macvlan_port_create(struct net_device *dev) return err; } +static void macvlan_port_rcu_free(struct rcu_head *head) +{ + struct macvlan_port *port; + + port = container_of(head, struct macvlan_port, rcu); + kfree(port); +} + static void macvlan_port_destroy(struct net_device *dev) { struct macvlan_port *port = dev->macvlan_port; netdev_rx_handler_unregister(dev); rcu_assign_pointer(dev->macvlan_port, NULL); - synchronize_rcu(); - kfree(port); + call_rcu(&port->rcu, macvlan_port_rcu_free); } static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[]) |