diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2014-12-09 22:23:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-10 03:49:58 +0100 |
| commit | 6ea3b446b9369c971bcab2a723d814d2295c77d3 (patch) | |
| tree | cd245bff2e8eec5a08909211399f1c88ade08ef4 /net/sched/cls_fw.c | |
| parent | amd-xgbe: Use disable_irq_nosync when in IRQ context (diff) | |
| download | linux-6ea3b446b9369c971bcab2a723d814d2295c77d3.tar.xz 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.c | 3 |
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; } |