diff options
Diffstat (limited to 'net/sched/act_simple.c')
-rw-r--r-- | net/sched/act_simple.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c index c7971182af07..36e1edad5990 100644 --- a/net/sched/act_simple.c +++ b/net/sched/act_simple.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/netdevice.h> | 16 | #include <linux/netdevice.h> |
17 | #include <linux/skbuff.h> | 17 | #include <linux/skbuff.h> |
18 | #include <linux/rtnetlink.h> | 18 | #include <linux/rtnetlink.h> |
19 | #include <net/netlink.h> | ||
19 | #include <net/pkt_sched.h> | 20 | #include <net/pkt_sched.h> |
20 | 21 | ||
21 | #define TCA_ACT_SIMP 22 | 22 | #define TCA_ACT_SIMP 22 |
@@ -155,7 +156,7 @@ static inline int tcf_simp_cleanup(struct tc_action *a, int bind) | |||
155 | static inline int tcf_simp_dump(struct sk_buff *skb, struct tc_action *a, | 156 | static inline int tcf_simp_dump(struct sk_buff *skb, struct tc_action *a, |
156 | int bind, int ref) | 157 | int bind, int ref) |
157 | { | 158 | { |
158 | unsigned char *b = skb->tail; | 159 | unsigned char *b = skb_tail_pointer(skb); |
159 | struct tcf_defact *d = a->priv; | 160 | struct tcf_defact *d = a->priv; |
160 | struct tc_defact opt; | 161 | struct tc_defact opt; |
161 | struct tcf_t t; | 162 | struct tcf_t t; |
@@ -173,7 +174,7 @@ static inline int tcf_simp_dump(struct sk_buff *skb, struct tc_action *a, | |||
173 | return skb->len; | 174 | return skb->len; |
174 | 175 | ||
175 | rtattr_failure: | 176 | rtattr_failure: |
176 | skb_trim(skb, b - skb->data); | 177 | nlmsg_trim(skb, b); |
177 | return -1; | 178 | return -1; |
178 | } | 179 | } |
179 | 180 | ||