net sched: actions use tcf_lastuse_update for consistency

Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c
index 2ba700c765e047f3781708c8789ee63dfcc1a37e..e0e6c6876bc711b21b13b36a406f434f8208334a 100644 (file)
--- a/net/sched/act_connmark.c
+++ b/net/sched/act_connmark.c
@@ -44,7 +44,7 @@ static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
        int proto;
 
        spin_lock(&ca->tcf_lock);
-       ca->tcf_tm.lastuse = jiffies;
+       tcf_lastuse_update(&ca->tcf_tm);
        bstats_update(&ca->tcf_bstats, skb);
 
        if (skb->protocol == htons(ETH_P_IP)) {

diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
index 28e934ed038a6f652d9aaa1b7d82dffd642d73a7..065f71618276ad4eb1c4e992a58eaa9141baddeb 100644 (file)
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
@@ -501,7 +501,7 @@ static int tcf_csum(struct sk_buff *skb,
        u32 update_flags;
 
        spin_lock(&p->tcf_lock);
-       p->tcf_tm.lastuse = jiffies;
+       tcf_lastuse_update(&p->tcf_tm);
        bstats_update(&p->tcf_bstats, skb);
        action = p->tcf_action;
        update_flags = p->update_flags;

diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
index 658046dfe02d7210501ee9f0324158b50f6e7858..649157624f463a7c04a024e33519fe5cfe99c00d 100644 (file)
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
@@ -623,7 +623,7 @@ static int tcf_ife_decode(struct sk_buff *skb, const struct tc_action *a,
 
        spin_lock(&ife->tcf_lock);
        bstats_update(&ife->tcf_bstats, skb);
-       ife->tcf_tm.lastuse = jiffies;
+       tcf_lastuse_update(&ife->tcf_tm);
        spin_unlock(&ife->tcf_lock);
 
        ifehdrln = ntohs(ifehdrln);
@@ -711,7 +711,7 @@ static int tcf_ife_encode(struct sk_buff *skb, const struct tc_action *a,
 
        spin_lock(&ife->tcf_lock);
        bstats_update(&ife->tcf_bstats, skb);
-       ife->tcf_tm.lastuse = jiffies;
+       tcf_lastuse_update(&ife->tcf_tm);
 
        if (!metalen) {         /* no metadata to send */
                /* abuse overlimits to count when we allow packet
@@ -802,7 +802,7 @@ static int tcf_ife_act(struct sk_buff *skb, const struct tc_action *a,
        pr_info_ratelimited("unknown failure(policy neither de/encode\n");
        spin_lock(&ife->tcf_lock);
        bstats_update(&ife->tcf_bstats, skb);
-       ife->tcf_tm.lastuse = jiffies;
+       tcf_lastuse_update(&ife->tcf_tm);
        ife->tcf_qstats.drops++;
        spin_unlock(&ife->tcf_lock);
 

diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 9f002ada7074ccdb648433b443870562962c8694..30e9087b35361f579a5d86e1d449ea485d483548 100644 (file)
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -212,7 +212,7 @@ static int tcf_ipt(struct sk_buff *skb, const struct tc_action *a,
 
        spin_lock(&ipt->tcf_lock);
 
-       ipt->tcf_tm.lastuse = jiffies;
+       tcf_lastuse_update(&ipt->tcf_tm);
        bstats_update(&ipt->tcf_bstats, skb);
 
        /* yes, we have to worry about both in and out dev

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 128942bc9e42e82ed11dad14448b69cd6858e541..d3ac73e90f002bb7a6ab91420f199f6ab095aaa5 100644 (file)
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -157,7 +157,6 @@ static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a,
        u32 at;
 
        tcf_lastuse_update(&m->tcf_tm);
-
        bstats_cpu_update(this_cpu_ptr(m->common.cpu_bstats), skb);
 
        rcu_read_lock();

diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c
index c0a879f940de1b8d7477936a50bb6beee91176aa..9135aa8f2970d383058a6a80f2ed7c957c715690 100644 (file)
--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
@@ -103,7 +103,7 @@ static int tcf_nat(struct sk_buff *skb, const struct tc_action *a,
 
        spin_lock(&p->tcf_lock);
 
-       p->tcf_tm.lastuse = jiffies;
+       tcf_lastuse_update(&p->tcf_tm);
        old_addr = p->old_addr;
        new_addr = p->new_addr;
        mask = p->mask;

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index c6e18f230af690879686d868ad560e091e993443..67a17265c967be000a99a41d7c1b6d094c6152c2 100644 (file)
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -121,7 +121,7 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
 
        spin_lock(&p->tcf_lock);
 
-       p->tcf_tm.lastuse = jiffies;
+       tcf_lastuse_update(&p->tcf_tm);
 
        if (p->tcfp_nkeys > 0) {
                struct tc_pedit_key *tkey = p->tcfp_keys;

diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index e42f8daca14796f4efd5175e2b298e9a70c2f2c9..f95d1c59698606c3db6d1259b71a226d95ea33b0 100644 (file)
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -35,7 +35,7 @@ static int tcf_simp(struct sk_buff *skb, const struct tc_action *a,
        struct tcf_defact *d = a->priv;
 
        spin_lock(&d->tcf_lock);
-       d->tcf_tm.lastuse = jiffies;
+       tcf_lastuse_update(&d->tcf_tm);
        bstats_update(&d->tcf_bstats, skb);
 
        /* print policy string followed by _ then packet count

diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
index e928802966bce46d02658102acaee9f717d0f3a6..82105c8cb60ff7e4f40a7331ee85c5b25c105cb0 100644 (file)
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
@@ -37,7 +37,7 @@ static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a,
        struct tcf_skbedit *d = a->priv;
 
        spin_lock(&d->tcf_lock);
-       d->tcf_tm.lastuse = jiffies;
+       tcf_lastuse_update(&d->tcf_tm);
        bstats_update(&d->tcf_bstats, skb);
 
        if (d->flags & SKBEDIT_F_PRIORITY)

diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
index ac4adc812c12eef8f565c1fd773b2885c647ba24..da5120f5513fa9b62c261017a2039aaf3a07356d 100644 (file)
--- a/net/sched/act_vlan.c
+++ b/net/sched/act_vlan.c
@@ -31,7 +31,7 @@ static int tcf_vlan(struct sk_buff *skb, const struct tc_action *a,
        int err;
 
        spin_lock(&v->tcf_lock);
-       v->tcf_tm.lastuse = jiffies;
+       tcf_lastuse_update(&v->tcf_tm);
        bstats_update(&v->tcf_bstats, skb);
        action = v->tcf_action;