aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-06-06 21:36:29 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-08 00:25:20 -0400
commit8b37ef0a1f6c2401fea3536facfa21191936bd6c (patch)
tree57c0933abf47485aa22d94bb3810341a9702b03b
parent271c1dfa61bc90a57648ff96f3eb92d4b4d4f11e (diff)
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 53422ce26f7f..59c315556a30 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -37,6 +37,7 @@ struct macvlan_port {
37 struct net_device *dev; 37 struct net_device *dev;
38 struct hlist_head vlan_hash[MACVLAN_HASH_SIZE]; 38 struct hlist_head vlan_hash[MACVLAN_HASH_SIZE];
39 struct list_head vlans; 39 struct list_head vlans;
40 struct rcu_head rcu;
40}; 41};
41 42
42static struct macvlan_dev *macvlan_hash_lookup(const struct macvlan_port *port, 43static struct macvlan_dev *macvlan_hash_lookup(const struct macvlan_port *port,
@@ -540,14 +541,21 @@ static int macvlan_port_create(struct net_device *dev)
540 return err; 541 return err;
541} 542}
542 543
544static void macvlan_port_rcu_free(struct rcu_head *head)
545{
546 struct macvlan_port *port;
547
548 port = container_of(head, struct macvlan_port, rcu);
549 kfree(port);
550}
551
543static void macvlan_port_destroy(struct net_device *dev) 552static void macvlan_port_destroy(struct net_device *dev)
544{ 553{
545 struct macvlan_port *port = dev->macvlan_port; 554 struct macvlan_port *port = dev->macvlan_port;
546 555
547 netdev_rx_handler_unregister(dev); 556 netdev_rx_handler_unregister(dev);
548 rcu_assign_pointer(dev->macvlan_port, NULL); 557 rcu_assign_pointer(dev->macvlan_port, NULL);
549 synchronize_rcu(); 558 call_rcu(&port->rcu, macvlan_port_rcu_free);
550 kfree(port);
551} 559}
552 560
553static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[]) 561static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[])