aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-10 12:03:57 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-10 12:03:57 -0800
commit7cf712db6087342e5e7e259d3883a7b5ac3212d1 (patch)
tree8f60eb59c29b81dafdc60ad5e04e957fc8f3cdee
parent58a14ee9c49aa2b9742c56a0477666335368e05e (diff)
parent30ddb159ff3c632fdad3c0abc2e7d586a59bc5d1 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: [PKT_SCHED] ematch: Fix build warning.
-rw-r--r--net/sched/ematch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index b29439ddcf7..5e6f82e0e6f 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -410,7 +410,7 @@ void tcf_em_tree_destroy(struct tcf_proto *tp, struct tcf_ematch_tree *tree)
if (em->ops->destroy)
em->ops->destroy(tp, em);
else if (!tcf_em_is_simple(em))
- kfree(em->data);
+ kfree((void *) em->data);
module_put(em->ops->owner);
}
}