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_route.c | |
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_route.c')
-rw-r--r-- | net/sched/cls_route.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c index 098a27360b91..2ecd24688554 100644 --- 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, | |||
593 | struct sk_buff *skb, struct tcmsg *t) | 593 | struct sk_buff *skb, struct tcmsg *t) |
594 | { | 594 | { |
595 | struct route4_filter *f = (struct route4_filter *)fh; | 595 | struct route4_filter *f = (struct route4_filter *)fh; |
596 | unsigned char *b = skb_tail_pointer(skb); | ||
597 | struct nlattr *nest; | 596 | struct nlattr *nest; |
598 | u32 id; | 597 | u32 id; |
599 | 598 | ||
@@ -635,7 +634,7 @@ static int route4_dump(struct net *net, struct tcf_proto *tp, unsigned long fh, | |||
635 | return skb->len; | 634 | return skb->len; |
636 | 635 | ||
637 | nla_put_failure: | 636 | nla_put_failure: |
638 | nlmsg_trim(skb, b); | 637 | nla_nest_cancel(skb, nest); |
639 | return -1; | 638 | return -1; |
640 | } | 639 | } |
641 | 640 | ||