net: sched: cls: use nla_nest_cancel instead of nlmsg_trim

To cancel nesting, this function is more convenient.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index 741bfa7debb2e60c03c0c95162dae57d15463d6a..221697ab0247c5e786c70e181a43c1145a30748b 100644 (file)
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@ -177,7 +177,6 @@ static int cls_cgroup_dump(struct net *net, struct tcf_proto *tp, unsigned long
                           struct sk_buff *skb, struct tcmsg *t)
 {
        struct cls_cgroup_head *head = rtnl_dereference(tp->root);
-       unsigned char *b = skb_tail_pointer(skb);
        struct nlattr *nest;
 
        t->tcm_handle = head->handle;
@@ -198,7 +197,7 @@ static int cls_cgroup_dump(struct net *net, struct tcf_proto *tp, unsigned long
        return skb->len;
 
 nla_put_failure:
-       nlmsg_trim(skb, b);
+       nla_nest_cancel(skb, nest);
        return -1;
 }
 

diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index 8e227180cabbef879adac8557085c0730a5c5c1e..15d68f24a521a8ec66fc42691f031d864f589416 100644 (file)
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -638,7 +638,7 @@ static int flow_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
        return skb->len;
 
 nla_put_failure:
-       nlmsg_trim(skb, nest);
+       nla_nest_cancel(skb, nest);
        return -1;
 }
 

diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index 23fda2ac0d19241638a6ec64e17c5764c5f95f11..a5269f76004c2974a2e1e650433a7ba394710965 100644 (file)
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -356,7 +356,6 @@ static int fw_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
 {
        struct fw_head *head = rtnl_dereference(tp->root);
        struct fw_filter *f = (struct fw_filter *)fh;
-       unsigned char *b = skb_tail_pointer(skb);
        struct nlattr *nest;
 
        if (f == NULL)
@@ -397,7 +396,7 @@ static int fw_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
        return skb->len;
 
 nla_put_failure:
-       nlmsg_trim(skb, b);
+       nla_nest_cancel(skb, nest);
        return -1;
 }
 

diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index 098a27360b91782893a7363de3858e040371bc10..2ecd24688554e76e38d98b7338072a37d4c0cea1 100644 (file)
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -593,7 +593,6 @@ static int route4_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
                       struct sk_buff *skb, struct tcmsg *t)
 {
        struct route4_filter *f = (struct route4_filter *)fh;
-       unsigned char *b = skb_tail_pointer(skb);
        struct nlattr *nest;
        u32 id;
 
@@ -635,7 +634,7 @@ static int route4_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
        return skb->len;
 
 nla_put_failure:
-       nlmsg_trim(skb, b);
+       nla_nest_cancel(skb, nest);
        return -1;
 }
 

diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
index b7af3623a26a21cfd254bceb929ef5ee0d47f557..edd8ade3fbc1f4358b4275940e6f62b3d814b3dd 100644 (file)
--- a/net/sched/cls_rsvp.h
+++ b/net/sched/cls_rsvp.h
@@ -653,7 +653,6 @@ static int rsvp_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
 {
        struct rsvp_filter *f = (struct rsvp_filter *)fh;
        struct rsvp_session *s;
-       unsigned char *b = skb_tail_pointer(skb);
        struct nlattr *nest;
        struct tc_rsvp_pinfo pinfo;
 
@@ -694,7 +693,7 @@ static int rsvp_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
        return skb->len;
 
 nla_put_failure:
-       nlmsg_trim(skb, b);
+       nla_nest_cancel(skb, nest);
        return -1;
 }
 

diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
index 0d9d8911a621fd2ef8c3b7bdee8edc476453164c..bd49bf547a479f139b25e0507b090d51c137c519 100644 (file)
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
@@ -489,11 +489,10 @@ static int tcindex_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
 {
        struct tcindex_data *p = rtnl_dereference(tp->root);
        struct tcindex_filter_result *r = (struct tcindex_filter_result *) fh;
-       unsigned char *b = skb_tail_pointer(skb);
        struct nlattr *nest;
 
-       pr_debug("tcindex_dump(tp %p,fh 0x%lx,skb %p,t %p),p %p,r %p,b %p\n",
-                tp, fh, skb, t, p, r, b);
+       pr_debug("tcindex_dump(tp %p,fh 0x%lx,skb %p,t %p),p %p,r %p\n",
+                tp, fh, skb, t, p, r);
        pr_debug("p->perfect %p p->h %p\n", p->perfect, p->h);
 
        nest = nla_nest_start(skb, TCA_OPTIONS);
@@ -543,7 +542,7 @@ static int tcindex_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
        return skb->len;
 
 nla_put_failure:
-       nlmsg_trim(skb, b);
+       nla_nest_cancel(skb, nest);
        return -1;
 }