aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-06-07 01:36:29 +0000
committerDavid S. Miller <davem@davemloft.net>2010-06-07 21:25:20 -0700
commit8b37ef0a1f6c2401fea3536facfa21191936bd6c (patch)
tree57c0933abf47485aa22d94bb3810341a9702b03b
parent271c1dfa61bc90a57648ff96f3eb92d4b4d4f11e (diff)
downloadmrst-s0i3-test-8b37ef0a1f6c2401fea3536facfa21191936bd6c.tar.gz
mrst-s0i3-test-8b37ef0a1f6c2401fea3536facfa21191936bd6c.tar.xz
mrst-s0i3-test-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>
-rw-r--r--drivers/net/macvlan.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 53422ce26f7..59c315556a3 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[])