]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PKT_SCHED] ematch: Fix build warning.
authorDavid S. Miller <davem@davemloft.net>
Sun, 10 Feb 2008 11:48:15 +0000 (03:48 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 10 Feb 2008 11:48:15 +0000 (03:48 -0800)
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>
net/sched/ematch.c

index b29439ddcf717053923a38b610a8ee89cac17744..5e6f82e0e6f3ca7c092e3a1628d69b416604d0f5 100644 (file)
@@ -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);
                }
        }