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

[karo-tx-linux.git] / net / ipv4 / fib_trie.c

diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index ff06b7543d9ff1310761c227c2e7b8f9ef1c68a0..49616fed9340265b203c7b1fbf10390f92c38020 100644 (file)
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -125,7 +125,6 @@ struct tnode {
        unsigned int empty_children;    /* KEYLENGTH bits needed */
        union {
                struct rcu_head rcu;
-               struct work_struct work;
                struct tnode *tnode_free;
        };
        struct rt_trie_node __rcu *child[0];
@@ -383,12 +382,6 @@ static struct tnode *tnode_alloc(size_t size)
                return vzalloc(size);
 }
 
-static void __tnode_vfree(struct work_struct *arg)
-{
-       struct tnode *tn = container_of(arg, struct tnode, work);
-       vfree(tn);
-}
-
 static void __tnode_free_rcu(struct rcu_head *head)
 {
        struct tnode *tn = container_of(head, struct tnode, rcu);
@@ -397,10 +390,8 @@ static void __tnode_free_rcu(struct rcu_head *head)
 
        if (size <= PAGE_SIZE)
                kfree(tn);
-       else {
-               INIT_WORK(&tn->work, __tnode_vfree);
-               schedule_work(&tn->work);
-       }
+       else
+               vfree(tn);
 }
 
 static inline void tnode_free(struct tnode *tn)