X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fsched%2Fact_gact.c;h=a9631e426d916c81fbe752cd5357d75e50f4dace;hb=b4b613fd83853f8c688b3de20ab1a42331257975;hp=87d0faf328672ef5d951bdd4b073a963ecc45389;hpb=6f8c480f998a619082f18407f8d7f4c29e94dc6e;p=linux-2.6 diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c index 87d0faf328..a9631e426d 100644 --- a/net/sched/act_gact.c +++ b/net/sched/act_gact.c @@ -10,25 +10,15 @@ * */ -#include -#include -#include #include #include #include -#include -#include -#include -#include #include -#include -#include #include #include #include #include -#include -#include +#include #include #include #include @@ -155,7 +145,7 @@ static int tcf_gact(struct sk_buff *skb, struct tc_action *a, struct tcf_result static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a, int bind, int ref) { - unsigned char *b = skb->tail; + unsigned char *b = skb_tail_pointer(skb); struct tc_gact opt; struct tcf_gact *gact = a->priv; struct tcf_t t; @@ -181,7 +171,7 @@ static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a, int bind, int return skb->len; rtattr_failure: - skb_trim(skb, b - skb->data); + nlmsg_trim(skb, b); return -1; }