Commit 9c4a4e48 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller

net sched: actions use tcf_lastuse_update for consistency

Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e69985c6
...@@ -44,7 +44,7 @@ static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a, ...@@ -44,7 +44,7 @@ static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
int proto; int proto;
spin_lock(&ca->tcf_lock); spin_lock(&ca->tcf_lock);
ca->tcf_tm.lastuse = jiffies; tcf_lastuse_update(&ca->tcf_tm);
bstats_update(&ca->tcf_bstats, skb); bstats_update(&ca->tcf_bstats, skb);
if (skb->protocol == htons(ETH_P_IP)) { if (skb->protocol == htons(ETH_P_IP)) {
......
...@@ -501,7 +501,7 @@ static int tcf_csum(struct sk_buff *skb, ...@@ -501,7 +501,7 @@ static int tcf_csum(struct sk_buff *skb,
u32 update_flags; u32 update_flags;
spin_lock(&p->tcf_lock); spin_lock(&p->tcf_lock);
p->tcf_tm.lastuse = jiffies; tcf_lastuse_update(&p->tcf_tm);
bstats_update(&p->tcf_bstats, skb); bstats_update(&p->tcf_bstats, skb);
action = p->tcf_action; action = p->tcf_action;
update_flags = p->update_flags; update_flags = p->update_flags;
......
...@@ -623,7 +623,7 @@ static int tcf_ife_decode(struct sk_buff *skb, const struct tc_action *a, ...@@ -623,7 +623,7 @@ static int tcf_ife_decode(struct sk_buff *skb, const struct tc_action *a,
spin_lock(&ife->tcf_lock); spin_lock(&ife->tcf_lock);
bstats_update(&ife->tcf_bstats, skb); bstats_update(&ife->tcf_bstats, skb);
ife->tcf_tm.lastuse = jiffies; tcf_lastuse_update(&ife->tcf_tm);
spin_unlock(&ife->tcf_lock); spin_unlock(&ife->tcf_lock);
ifehdrln = ntohs(ifehdrln); ifehdrln = ntohs(ifehdrln);
...@@ -711,7 +711,7 @@ static int tcf_ife_encode(struct sk_buff *skb, const struct tc_action *a, ...@@ -711,7 +711,7 @@ static int tcf_ife_encode(struct sk_buff *skb, const struct tc_action *a,
spin_lock(&ife->tcf_lock); spin_lock(&ife->tcf_lock);
bstats_update(&ife->tcf_bstats, skb); bstats_update(&ife->tcf_bstats, skb);
ife->tcf_tm.lastuse = jiffies; tcf_lastuse_update(&ife->tcf_tm);
if (!metalen) { /* no metadata to send */ if (!metalen) { /* no metadata to send */
/* abuse overlimits to count when we allow packet /* 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, ...@@ -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"); pr_info_ratelimited("unknown failure(policy neither de/encode\n");
spin_lock(&ife->tcf_lock); spin_lock(&ife->tcf_lock);
bstats_update(&ife->tcf_bstats, skb); bstats_update(&ife->tcf_bstats, skb);
ife->tcf_tm.lastuse = jiffies; tcf_lastuse_update(&ife->tcf_tm);
ife->tcf_qstats.drops++; ife->tcf_qstats.drops++;
spin_unlock(&ife->tcf_lock); spin_unlock(&ife->tcf_lock);
......
...@@ -212,7 +212,7 @@ static int tcf_ipt(struct sk_buff *skb, const struct tc_action *a, ...@@ -212,7 +212,7 @@ static int tcf_ipt(struct sk_buff *skb, const struct tc_action *a,
spin_lock(&ipt->tcf_lock); spin_lock(&ipt->tcf_lock);
ipt->tcf_tm.lastuse = jiffies; tcf_lastuse_update(&ipt->tcf_tm);
bstats_update(&ipt->tcf_bstats, skb); bstats_update(&ipt->tcf_bstats, skb);
/* yes, we have to worry about both in and out dev /* yes, we have to worry about both in and out dev
......
...@@ -157,7 +157,6 @@ static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a, ...@@ -157,7 +157,6 @@ static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a,
u32 at; u32 at;
tcf_lastuse_update(&m->tcf_tm); tcf_lastuse_update(&m->tcf_tm);
bstats_cpu_update(this_cpu_ptr(m->common.cpu_bstats), skb); bstats_cpu_update(this_cpu_ptr(m->common.cpu_bstats), skb);
rcu_read_lock(); rcu_read_lock();
......
...@@ -103,7 +103,7 @@ static int tcf_nat(struct sk_buff *skb, const struct tc_action *a, ...@@ -103,7 +103,7 @@ static int tcf_nat(struct sk_buff *skb, const struct tc_action *a,
spin_lock(&p->tcf_lock); spin_lock(&p->tcf_lock);
p->tcf_tm.lastuse = jiffies; tcf_lastuse_update(&p->tcf_tm);
old_addr = p->old_addr; old_addr = p->old_addr;
new_addr = p->new_addr; new_addr = p->new_addr;
mask = p->mask; mask = p->mask;
......
...@@ -121,7 +121,7 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a, ...@@ -121,7 +121,7 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
spin_lock(&p->tcf_lock); spin_lock(&p->tcf_lock);
p->tcf_tm.lastuse = jiffies; tcf_lastuse_update(&p->tcf_tm);
if (p->tcfp_nkeys > 0) { if (p->tcfp_nkeys > 0) {
struct tc_pedit_key *tkey = p->tcfp_keys; struct tc_pedit_key *tkey = p->tcfp_keys;
......
...@@ -35,7 +35,7 @@ static int tcf_simp(struct sk_buff *skb, const struct tc_action *a, ...@@ -35,7 +35,7 @@ static int tcf_simp(struct sk_buff *skb, const struct tc_action *a,
struct tcf_defact *d = a->priv; struct tcf_defact *d = a->priv;
spin_lock(&d->tcf_lock); spin_lock(&d->tcf_lock);
d->tcf_tm.lastuse = jiffies; tcf_lastuse_update(&d->tcf_tm);
bstats_update(&d->tcf_bstats, skb); bstats_update(&d->tcf_bstats, skb);
/* print policy string followed by _ then packet count /* print policy string followed by _ then packet count
......
...@@ -37,7 +37,7 @@ static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a, ...@@ -37,7 +37,7 @@ static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a,
struct tcf_skbedit *d = a->priv; struct tcf_skbedit *d = a->priv;
spin_lock(&d->tcf_lock); spin_lock(&d->tcf_lock);
d->tcf_tm.lastuse = jiffies; tcf_lastuse_update(&d->tcf_tm);
bstats_update(&d->tcf_bstats, skb); bstats_update(&d->tcf_bstats, skb);
if (d->flags & SKBEDIT_F_PRIORITY) if (d->flags & SKBEDIT_F_PRIORITY)
......
...@@ -31,7 +31,7 @@ static int tcf_vlan(struct sk_buff *skb, const struct tc_action *a, ...@@ -31,7 +31,7 @@ static int tcf_vlan(struct sk_buff *skb, const struct tc_action *a,
int err; int err;
spin_lock(&v->tcf_lock); spin_lock(&v->tcf_lock);
v->tcf_tm.lastuse = jiffies; tcf_lastuse_update(&v->tcf_tm);
bstats_update(&v->tcf_bstats, skb); bstats_update(&v->tcf_bstats, skb);
action = v->tcf_action; action = v->tcf_action;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment