Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23

[linux-2.6] / net / sched / act_simple.c

diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index ecbcfa59b76cc61b44e7bb71867ee798aa47550b..fb84ef33d14f75d82281ab21b932ebea416e1e6f 100644 (file)
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -13,9 +13,9 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <linux/rtnetlink.h>
+#include <net/netlink.h>
 #include <net/pkt_sched.h>
 
 #define TCA_ACT_SIMP 22
@@ -173,7 +173,7 @@ static inline int tcf_simp_dump(struct sk_buff *skb, struct tc_action *a,
        return skb->len;
 
 rtattr_failure:
-       skb_trim(skb, b - skb->data);
+       nlmsg_trim(skb, b);
        return -1;
 }