summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-02-10 03:48:15 -0800
committerDavid S. Miller <davem@davemloft.net>2008-02-10 03:48:15 -0800
commit30ddb159ff3c632fdad3c0abc2e7d586a59bc5d1 (patch)
tree6535914379c0abd33c414c971b10c501e00db4ab
parent25f666300625d894ebe04bac2b4b3aadb907c861 (diff)
downloadlinux-30ddb159ff3c632fdad3c0abc2e7d586a59bc5d1.tar.gz
linux-30ddb159ff3c632fdad3c0abc2e7d586a59bc5d1.tar.bz2
linux-30ddb159ff3c632fdad3c0abc2e7d586a59bc5d1.zip
[PKT_SCHED] ematch: Fix build warning.
Commit 954415e33ed6cfa932c13e8c2460bd05e50723b5 ("[PKT_SCHED] ematch: tcf_em_destroy robustness") removed a cast on em->data when passing it to kfree(), but em->data is an integer type that can hold pointers as well as other values so the cast is necessary. Signed-off-by: David S. Miller <davem@davemloft.net>
-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 b29439ddcf71..5e6f82e0e6f3 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);
}
}