flow_offload: rename exts stats update functions with hw

Rename exts stats update functions with hw for readability.

We make this change also to update stats from hw for an action
when it is offloaded to hw as a single action.

Signed-off-by: Baowen Zheng <baowen.zheng@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 1bfb616..efdfab8 100644 (file)
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -266,9 +266,9 @@ static inline void tcf_exts_put_net(struct tcf_exts *exts)
        for (i = 0; i < TCA_ACT_MAX_PRIO && ((a) = actions[i]); i++)
 
 static inline void
-tcf_exts_stats_update(const struct tcf_exts *exts,
-                     u64 bytes, u64 packets, u64 drops, u64 lastuse,
-                     u8 used_hw_stats, bool used_hw_stats_valid)
+tcf_exts_hw_stats_update(const struct tcf_exts *exts,
+                        u64 bytes, u64 packets, u64 drops, u64 lastuse,
+                        u8 used_hw_stats, bool used_hw_stats_valid)
 {
 #ifdef CONFIG_NET_CLS_ACT
        int i;

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index f4dad3b..9a63bc4 100644 (file)
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -501,12 +501,12 @@ 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,
                         rtnl_held);
 
-       tcf_exts_stats_update(&f->exts, cls_flower.stats.bytes,
-                             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);
+       tcf_exts_hw_stats_update(&f->exts, cls_flower.stats.bytes,
+                                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)

diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index 2d27029..5b9264d 100644 (file)
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -336,11 +336,11 @@ static void mall_stats_hw_filter(struct tcf_proto *tp,
 
        tc_setup_cb_call(block, TC_SETUP_CLSMATCHALL, &cls_mall, false, true);
 
-       tcf_exts_stats_update(&head->exts, cls_mall.stats.bytes,
-                             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);
+       tcf_exts_hw_stats_update(&head->exts, cls_mall.stats.bytes,
+                                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,