Commit ac7d2790 authored by Oz Shlomo's avatar Oz Shlomo Committed by Paolo Abeni

net/sched: pass flow_stats instead of multiple stats args

Instead of passing 6 stats related args, pass the flow_stats.
Signed-off-by: default avatarOz Shlomo <ozsh@nvidia.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 3320f36f
...@@ -294,8 +294,7 @@ static inline void tcf_exts_put_net(struct tcf_exts *exts) ...@@ -294,8 +294,7 @@ static inline void tcf_exts_put_net(struct tcf_exts *exts)
static inline void static inline void
tcf_exts_hw_stats_update(const struct tcf_exts *exts, tcf_exts_hw_stats_update(const struct tcf_exts *exts,
u64 bytes, u64 packets, u64 drops, u64 lastuse, struct flow_stats *stats)
u8 used_hw_stats, bool used_hw_stats_valid)
{ {
#ifdef CONFIG_NET_CLS_ACT #ifdef CONFIG_NET_CLS_ACT
int i; int i;
...@@ -306,12 +305,12 @@ tcf_exts_hw_stats_update(const struct tcf_exts *exts, ...@@ -306,12 +305,12 @@ tcf_exts_hw_stats_update(const struct tcf_exts *exts,
/* if stats from hw, just skip */ /* if stats from hw, just skip */
if (tcf_action_update_hw_stats(a)) { if (tcf_action_update_hw_stats(a)) {
preempt_disable(); preempt_disable();
tcf_action_stats_update(a, bytes, packets, drops, tcf_action_stats_update(a, stats->bytes, stats->pkts, stats->drops,
lastuse, true); stats->lastused, true);
preempt_enable(); preempt_enable();
a->used_hw_stats = used_hw_stats; a->used_hw_stats = stats->used_hw_stats;
a->used_hw_stats_valid = used_hw_stats_valid; a->used_hw_stats_valid = stats->used_hw_stats_valid;
} }
} }
#endif #endif
......
...@@ -502,12 +502,7 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f, ...@@ -502,12 +502,7 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f,
tc_setup_cb_call(block, TC_SETUP_CLSFLOWER, &cls_flower, false, tc_setup_cb_call(block, TC_SETUP_CLSFLOWER, &cls_flower, false,
rtnl_held); rtnl_held);
tcf_exts_hw_stats_update(&f->exts, cls_flower.stats.bytes, tcf_exts_hw_stats_update(&f->exts, &cls_flower.stats);
cls_flower.stats.pkts,
cls_flower.stats.drops,
cls_flower.stats.lastused,
cls_flower.stats.used_hw_stats,
cls_flower.stats.used_hw_stats_valid);
} }
static void __fl_put(struct cls_fl_filter *f) static void __fl_put(struct cls_fl_filter *f)
......
...@@ -331,11 +331,7 @@ static void mall_stats_hw_filter(struct tcf_proto *tp, ...@@ -331,11 +331,7 @@ static void mall_stats_hw_filter(struct tcf_proto *tp,
tc_setup_cb_call(block, TC_SETUP_CLSMATCHALL, &cls_mall, false, true); tc_setup_cb_call(block, TC_SETUP_CLSMATCHALL, &cls_mall, false, true);
tcf_exts_hw_stats_update(&head->exts, cls_mall.stats.bytes, tcf_exts_hw_stats_update(&head->exts, &cls_mall.stats);
cls_mall.stats.pkts, cls_mall.stats.drops,
cls_mall.stats.lastused,
cls_mall.stats.used_hw_stats,
cls_mall.stats.used_hw_stats_valid);
} }
static int mall_dump(struct net *net, struct tcf_proto *tp, void *fh, static int mall_dump(struct net *net, struct tcf_proto *tp, void *fh,
......
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