phonet: use call_rcu for phonet device 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>

diff --git a/include/net/phonet/pn_dev.h b/include/net/phonet/pn_dev.h
index d7b989ca3d6320e3c7f7abe0f9d25d5565eadb6e..2d16783d5e201232d8ff47c1165d767ea91435de 100644 (file)
--- a/include/net/phonet/pn_dev.h
+++ b/include/net/phonet/pn_dev.h
@@ -34,6 +34,7 @@ struct phonet_device {
        struct list_head list;
        struct net_device *netdev;
        DECLARE_BITMAP(addrs, 64);
+       struct rcu_head rcu;
 };
 
 int phonet_device_init(void);

diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
index c33da65769420555a4a3cb60c0d5585519111f11..b18e48fae9759cf20d735031bc1f18a7e8857a11 100644 (file)
--- a/net/phonet/pn_dev.c
+++ b/net/phonet/pn_dev.c
@@ -162,6 +162,14 @@ int phonet_address_add(struct net_device *dev, u8 addr)
        return err;
 }
 
+static void phonet_device_rcu_free(struct rcu_head *head)
+{
+       struct phonet_device *pnd;
+
+       pnd = container_of(head, struct phonet_device, rcu);
+       kfree(pnd);
+}
+
 int phonet_address_del(struct net_device *dev, u8 addr)
 {
        struct phonet_device_list *pndevs = phonet_device_list(dev_net(dev));
@@ -179,10 +187,9 @@ int phonet_address_del(struct net_device *dev, u8 addr)
                pnd = NULL;
        mutex_unlock(&pndevs->lock);
 
-       if (pnd) {
-               synchronize_rcu();
-               kfree(pnd);
-       }
+       if (pnd)
+               call_rcu(&pnd->rcu, phonet_device_rcu_free);
+
        return err;
 }