From: David S. Miller <davem@davemloft.net>
Date: Sun, 10 Feb 2008 11:48:15 +0000 (-0800)
Subject: [PKT_SCHED] ematch: Fix build warning.
X-Git-Tag: v2.6.25-rc1~4^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=30ddb159ff3c632fdad3c0abc2e7d586a59bc5d1;p=linux-2.6-omap-h63xx.git

[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>
---

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);
 		}
 	}