flow_offload: rename offload functions with offload instead of flow

To improves readability, we rename offload functions with offload instead
of flow.

The term flow is related to exact matches, so we rename these functions
with offload.

We make this change to facilitate single action offload functions naming.

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 cebc1bd713b68e9c9c7b7656f569e749c0dc9297..5d4ff76d37e28aa30f6ddb1af732cb51485c52be 100644 (file)
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -536,9 +536,9 @@ tcf_match_indev(struct sk_buff *skb, int ifindex)
        return ifindex == skb->skb_iif;
 }
 
-int tc_setup_flow_action(struct flow_action *flow_action,
-                        const struct tcf_exts *exts);
-void tc_cleanup_flow_action(struct flow_action *flow_action);
+int tc_setup_offload_action(struct flow_action *flow_action,
+                           const struct tcf_exts *exts);
+void tc_cleanup_offload_action(struct flow_action *flow_action);
 
 int tc_setup_cb_call(struct tcf_block *block, enum tc_setup_type type,
                     void *type_data, bool err_stop, bool rtnl_held);

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index dea1dca6a0fd152c6bbad388509b9a4dc0c524f7..61b5012c65dcf9d0f5c83659aa501ddb621c1a2c 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -3461,7 +3461,7 @@ static void tcf_act_put_cookie(struct flow_action_entry *entry)
        flow_action_cookie_destroy(entry->cookie);
 }
 
-void tc_cleanup_flow_action(struct flow_action *flow_action)
+void tc_cleanup_offload_action(struct flow_action *flow_action)
 {
        struct flow_action_entry *entry;
        int i;
@@ -3472,7 +3472,7 @@ void tc_cleanup_flow_action(struct flow_action *flow_action)
                        entry->destructor(entry->destructor_priv);
        }
 }
-EXPORT_SYMBOL(tc_cleanup_flow_action);
+EXPORT_SYMBOL(tc_cleanup_offload_action);
 
 static void tcf_mirred_get_dev(struct flow_action_entry *entry,
                               const struct tc_action *act)
@@ -3544,8 +3544,8 @@ static enum flow_action_hw_stats tc_act_hw_stats(u8 hw_stats)
        return hw_stats;
 }
 
-int tc_setup_flow_action(struct flow_action *flow_action,
-                        const struct tcf_exts *exts)
+int tc_setup_offload_action(struct flow_action *flow_action,
+                           const struct tcf_exts *exts)
 {
        struct tc_action *act;
        int i, j, k, err = 0;
@@ -3718,14 +3718,14 @@ int tc_setup_flow_action(struct flow_action *flow_action,
 
 err_out:
        if (err)
-               tc_cleanup_flow_action(flow_action);
+               tc_cleanup_offload_action(flow_action);
 
        return err;
 err_out_locked:
        spin_unlock_bh(&act->tcfa_lock);
        goto err_out;
 }
-EXPORT_SYMBOL(tc_setup_flow_action);
+EXPORT_SYMBOL(tc_setup_offload_action);
 
 unsigned int tcf_exts_num_actions(struct tcf_exts *exts)
 {

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index aab13ba1176729cca0e4f010c82a9b467353ce44..f4dad3be31c998c0a437e00cfb209010a2e4d12f 100644 (file)
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -461,7 +461,7 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
        cls_flower.rule->match.key = &f->mkey;
        cls_flower.classid = f->res.classid;
 
-       err = tc_setup_flow_action(&cls_flower.rule->action, &f->exts);
+       err = tc_setup_offload_action(&cls_flower.rule->action, &f->exts);
        if (err) {
                kfree(cls_flower.rule);
                if (skip_sw) {
@@ -473,7 +473,7 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
 
        err = tc_setup_cb_add(block, tp, TC_SETUP_CLSFLOWER, &cls_flower,
                              skip_sw, &f->flags, &f->in_hw_count, rtnl_held);
-       tc_cleanup_flow_action(&cls_flower.rule->action);
+       tc_cleanup_offload_action(&cls_flower.rule->action);
        kfree(cls_flower.rule);
 
        if (err) {
@@ -2266,7 +2266,7 @@ static int fl_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb,
                cls_flower.rule->match.mask = &f->mask->key;
                cls_flower.rule->match.key = &f->mkey;
 
-               err = tc_setup_flow_action(&cls_flower.rule->action, &f->exts);
+               err = tc_setup_offload_action(&cls_flower.rule->action, &f->exts);
                if (err) {
                        kfree(cls_flower.rule);
                        if (tc_skip_sw(f->flags)) {
@@ -2283,7 +2283,7 @@ static int fl_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb,
                                            TC_SETUP_CLSFLOWER, &cls_flower,
                                            cb_priv, &f->flags,
                                            &f->in_hw_count);
-               tc_cleanup_flow_action(&cls_flower.rule->action);
+               tc_cleanup_offload_action(&cls_flower.rule->action);
                kfree(cls_flower.rule);
 
                if (err) {

diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index 24f0046ce0b333ac1876ab1bdc026fbcbde4dfea..2d2702915cfad1384d185b8cbd879bcc5d181f5b 100644 (file)
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -97,7 +97,7 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
        cls_mall.command = TC_CLSMATCHALL_REPLACE;
        cls_mall.cookie = cookie;
 
-       err = tc_setup_flow_action(&cls_mall.rule->action, &head->exts);
+       err = tc_setup_offload_action(&cls_mall.rule->action, &head->exts);
        if (err) {
                kfree(cls_mall.rule);
                mall_destroy_hw_filter(tp, head, cookie, NULL);
@@ -111,7 +111,7 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
 
        err = tc_setup_cb_add(block, tp, TC_SETUP_CLSMATCHALL, &cls_mall,
                              skip_sw, &head->flags, &head->in_hw_count, true);
-       tc_cleanup_flow_action(&cls_mall.rule->action);
+       tc_cleanup_offload_action(&cls_mall.rule->action);
        kfree(cls_mall.rule);
 
        if (err) {
@@ -301,7 +301,7 @@ static int mall_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb,
                TC_CLSMATCHALL_REPLACE : TC_CLSMATCHALL_DESTROY;
        cls_mall.cookie = (unsigned long)head;
 
-       err = tc_setup_flow_action(&cls_mall.rule->action, &head->exts);
+       err = tc_setup_offload_action(&cls_mall.rule->action, &head->exts);
        if (err) {
                kfree(cls_mall.rule);
                if (add && tc_skip_sw(head->flags)) {
@@ -314,7 +314,7 @@ static int mall_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb,
        err = tc_setup_cb_reoffload(block, tp, add, cb, TC_SETUP_CLSMATCHALL,
                                    &cls_mall, cb_priv, &head->flags,
                                    &head->in_hw_count);
-       tc_cleanup_flow_action(&cls_mall.rule->action);
+       tc_cleanup_offload_action(&cls_mall.rule->action);
        kfree(cls_mall.rule);
 
        if (err)