diff options
| author | Jamal Hadi Salim <jhs@mojatatu.com> | 2016-06-06 06:32:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-07 15:53:43 -0700 |
| commit | 48d8ee1694dd1ab25614b58f968123a4598f887e (patch) | |
| tree | 175c3ca36e719394ab7f882e2030d0c55b4487c8 /net/sched/act_pedit.c | |
| parent | 53eb440f4ada034ea43b295891feec3df0fa7a29 (diff) | |
| download | blackbird-obmc-linux-48d8ee1694dd1ab25614b58f968123a4598f887e.tar.gz blackbird-obmc-linux-48d8ee1694dd1ab25614b58f968123a4598f887e.zip | |
net sched actions: aggregate dumping of actions timeinfo
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_pedit.c')
| -rw-r--r-- | net/sched/act_pedit.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c index fb89275bc595..82d3c1479029 100644 --- a/net/sched/act_pedit.c +++ b/net/sched/act_pedit.c @@ -200,12 +200,11 @@ static int tcf_pedit_dump(struct sk_buff *skb, struct tc_action *a, if (nla_put(skb, TCA_PEDIT_PARMS, s, opt)) goto nla_put_failure; - t.install = jiffies_to_clock_t(jiffies - p->tcf_tm.install); - t.lastuse = jiffies_to_clock_t(jiffies - p->tcf_tm.lastuse); - t.firstuse = jiffies_to_clock_t(jiffies - p->tcf_tm.firstuse); - t.expires = jiffies_to_clock_t(p->tcf_tm.expires); + + tcf_tm_dump(&t, &p->tcf_tm); if (nla_put_64bit(skb, TCA_PEDIT_TM, sizeof(t), &t, TCA_PEDIT_PAD)) goto nla_put_failure; + kfree(opt); return skb->len; |
