diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-07 15:53:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-07 15:53:44 -0700 |
| commit | be119913689724b6fe84caa779c2508547c4e8d5 (patch) | |
| tree | 175c3ca36e719394ab7f882e2030d0c55b4487c8 /net/sched/act_gact.c | |
| parent | e69985c67c33f1d981a87986237366e83a8f0e13 (diff) | |
| parent | 48d8ee1694dd1ab25614b58f968123a4598f887e (diff) | |
| download | linux-stable-be119913689724b6fe84caa779c2508547c4e8d5.tar.gz linux-stable-be119913689724b6fe84caa779c2508547c4e8d5.tar.bz2 linux-stable-be119913689724b6fe84caa779c2508547c4e8d5.zip | |
Merge branch 'sch-action-tstamp'
Jamal Hadi Salim says:
====================
net sched action timestamp improvements
Various aggregations of duplicated code, fixes and introduction of firstused
timestamp
v2: add const for source time info per suggestion from Cong
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_gact.c')
| -rw-r--r-- | net/sched/act_gact.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c index ec5cc8435238..4c6e0085054a 100644 --- a/net/sched/act_gact.c +++ b/net/sched/act_gact.c @@ -188,9 +188,7 @@ static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a, int bind, int goto nla_put_failure; } #endif - t.install = jiffies_to_clock_t(jiffies - gact->tcf_tm.install); - t.lastuse = jiffies_to_clock_t(jiffies - gact->tcf_tm.lastuse); - t.expires = jiffies_to_clock_t(gact->tcf_tm.expires); + tcf_tm_dump(&t, &gact->tcf_tm); if (nla_put_64bit(skb, TCA_GACT_TM, sizeof(t), &t, TCA_GACT_PAD)) goto nla_put_failure; return skb->len; |