diff options
author | Jiri Pirko <jiri@resnulli.us> | 2014-12-09 16:23:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-12-09 21:49:58 -0500 |
commit | 6ea3b446b9369c971bcab2a723d814d2295c77d3 (patch) | |
tree | cd245bff2e8eec5a08909211399f1c88ade08ef4 /net/sched/cls_rsvp.h | |
parent | f9c5c62db1c9bc20f396c3527b5074c4e7f1c275 (diff) |
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>
Diffstat (limited to 'net/sched/cls_rsvp.h')
-rw-r--r-- | net/sched/cls_rsvp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h index b7af3623a26a..edd8ade3fbc1 100644 --- 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, | |||
653 | { | 653 | { |
654 | struct rsvp_filter *f = (struct rsvp_filter *)fh; | 654 | struct rsvp_filter *f = (struct rsvp_filter *)fh; |
655 | struct rsvp_session *s; | 655 | struct rsvp_session *s; |
656 | unsigned char *b = skb_tail_pointer(skb); | ||
657 | struct nlattr *nest; | 656 | struct nlattr *nest; |
658 | struct tc_rsvp_pinfo pinfo; | 657 | struct tc_rsvp_pinfo pinfo; |
659 | 658 | ||
@@ -694,7 +693,7 @@ static int rsvp_dump(struct net *net, struct tcf_proto *tp, unsigned long fh, | |||
694 | return skb->len; | 693 | return skb->len; |
695 | 694 | ||
696 | nla_put_failure: | 695 | nla_put_failure: |
697 | nlmsg_trim(skb, b); | 696 | nla_nest_cancel(skb, nest); |
698 | return -1; | 697 | return -1; |
699 | } | 698 | } |
700 | 699 | ||