Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[pandora-kernel.git] / net / phonet / pn_dev.c

diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
index 47b3452..d2df8f3 100644 (file)
--- a/net/phonet/pn_dev.c
+++ b/net/phonet/pn_dev.c
@@ -162,14 +162,6 @@ 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));
@@ -188,7 +180,7 @@ int phonet_address_del(struct net_device *dev, u8 addr)
        mutex_unlock(&pndevs->lock);
 
        if (pnd)
-               call_rcu(&pnd->rcu, phonet_device_rcu_free);
+               kfree_rcu(pnd, rcu);
 
        return err;
 }