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_ipt.c | |
| parent | 53eb440f4ada034ea43b295891feec3df0fa7a29 (diff) | |
| download | talos-obmc-linux-48d8ee1694dd1ab25614b58f968123a4598f887e.tar.gz talos-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_ipt.c')
| -rw-r--r-- | net/sched/act_ipt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c index 47525ee201a9..3fcde44b8f4d 100644 --- a/net/sched/act_ipt.c +++ b/net/sched/act_ipt.c @@ -277,12 +277,11 @@ static int tcf_ipt_dump(struct sk_buff *skb, struct tc_action *a, int bind, int nla_put(skb, TCA_IPT_CNT, sizeof(struct tc_cnt), &c) || nla_put_string(skb, TCA_IPT_TABLE, ipt->tcfi_tname)) goto nla_put_failure; - tm.install = jiffies_to_clock_t(jiffies - ipt->tcf_tm.install); - tm.lastuse = jiffies_to_clock_t(jiffies - ipt->tcf_tm.lastuse); - tm.firstuse = jiffies_to_clock_t(jiffies - ipt->tcf_tm.firstuse); - tm.expires = jiffies_to_clock_t(ipt->tcf_tm.expires); + + tcf_tm_dump(&tm, &ipt->tcf_tm); if (nla_put_64bit(skb, TCA_IPT_TM, sizeof(tm), &tm, TCA_IPT_PAD)) goto nla_put_failure; + kfree(t); return skb->len; |
