summaryrefslogtreecommitdiffstats
path: root/net/sched/cls_fw.c
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2014-12-09 22:23:29 +0100
committerDavid S. Miller <davem@davemloft.net>2014-12-09 21:49:58 -0500
commit6ea3b446b9369c971bcab2a723d814d2295c77d3 (patch)
treecd245bff2e8eec5a08909211399f1c88ade08ef4 /net/sched/cls_fw.c
parentf9c5c62db1c9bc20f396c3527b5074c4e7f1c275 (diff)
downloadtalos-obmc-linux-6ea3b446b9369c971bcab2a723d814d2295c77d3.tar.gz
talos-obmc-linux-6ea3b446b9369c971bcab2a723d814d2295c77d3.zip
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_fw.c')
-rw-r--r--net/sched/cls_fw.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index 23fda2ac0d19..a5269f76004c 100644
--- 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;
}
OpenPOWER on IntegriCloud