devlink: Move dpipe entry clear function into devlink

The entry clear routine can be shared between the drivers, thus it is
moved inside devlink.

Signed-off-by: Arkadi Sharshevsky <arkadis@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
index 9eb265bd54308a714c6ecee6e86fa725e7b44903..1305df9c6bf92bf3520ccd421f5b4277be1047f3 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
@@ -114,26 +114,6 @@ static int mlxsw_sp_dpipe_table_erif_matches_dump(void *priv,
        return devlink_dpipe_match_put(skb, &match);
 }
 
-static void mlxsw_sp_erif_entry_clear(struct devlink_dpipe_entry *entry)
-{
-       unsigned int value_count, value_index;
-       struct devlink_dpipe_value *value;
-
-       value = entry->action_values;
-       value_count = entry->action_values_count;
-       for (value_index = 0; value_index < value_count; value_index++) {
-               kfree(value[value_index].value);
-               kfree(value[value_index].mask);
-       }
-
-       value = entry->match_values;
-       value_count = entry->match_values_count;
-       for (value_index = 0; value_index < value_count; value_index++) {
-               kfree(value[value_index].value);
-               kfree(value[value_index].mask);
-       }
-}
-
 static void
 mlxsw_sp_erif_match_action_prepare(struct devlink_dpipe_match *match,
                                   struct devlink_dpipe_action *action)
@@ -270,12 +250,12 @@ start_again:
                goto start_again;
        rtnl_unlock();
 
-       mlxsw_sp_erif_entry_clear(&entry);
+       devlink_dpipe_entry_clear(&entry);
        return 0;
 err_entry_append:
 err_entry_get:
        rtnl_unlock();
-       mlxsw_sp_erif_entry_clear(&entry);
+       devlink_dpipe_entry_clear(&entry);
        return err;
 }
 

diff --git a/include/net/devlink.h b/include/net/devlink.h
index e96272b2cfec365b0417d6c62919c24483592916..047a0c54f6520943f94fe0ed4c37eb75edd7fc75 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -323,6 +323,7 @@ int devlink_dpipe_entry_ctx_prepare(struct devlink_dpipe_dump_ctx *dump_ctx);
 int devlink_dpipe_entry_ctx_append(struct devlink_dpipe_dump_ctx *dump_ctx,
                                   struct devlink_dpipe_entry *entry);
 int devlink_dpipe_entry_ctx_close(struct devlink_dpipe_dump_ctx *dump_ctx);
+void devlink_dpipe_entry_clear(struct devlink_dpipe_entry *entry);
 int devlink_dpipe_action_put(struct sk_buff *skb,
                             struct devlink_dpipe_action *action);
 int devlink_dpipe_match_put(struct sk_buff *skb,
@@ -448,6 +449,11 @@ devlink_dpipe_entry_ctx_close(struct devlink_dpipe_dump_ctx *dump_ctx)
        return 0;
 }
 
+static inline void
+devlink_dpipe_entry_clear(struct devlink_dpipe_entry *entry)
+{
+}
+
 static inline int
 devlink_dpipe_action_put(struct sk_buff *skb,
                         struct devlink_dpipe_action *action)

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 87062ff36ab44ac613194862efc452aa01b36d76..194708aa5f11d366e9ed78f0463f86cfad030475 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -1996,6 +1996,28 @@ int devlink_dpipe_entry_ctx_close(struct devlink_dpipe_dump_ctx *dump_ctx)
 }
 EXPORT_SYMBOL_GPL(devlink_dpipe_entry_ctx_close);
 
+void devlink_dpipe_entry_clear(struct devlink_dpipe_entry *entry)
+
+{
+       unsigned int value_count, value_index;
+       struct devlink_dpipe_value *value;
+
+       value = entry->action_values;
+       value_count = entry->action_values_count;
+       for (value_index = 0; value_index < value_count; value_index++) {
+               kfree(value[value_index].value);
+               kfree(value[value_index].mask);
+       }
+
+       value = entry->match_values;
+       value_count = entry->match_values_count;
+       for (value_index = 0; value_index < value_count; value_index++) {
+               kfree(value[value_index].value);
+               kfree(value[value_index].mask);
+       }
+}
+EXPORT_SYMBOL(devlink_dpipe_entry_clear);
+
 static int devlink_dpipe_entries_fill(struct genl_info *info,
                                      enum devlink_command cmd, int flags,
                                      struct devlink_dpipe_table *table)