The generic flow layer now assigns the parsed rule to `flow->rule` after successful creation. Engine create callbacks no longer use the flow handle, and all four implementations mark it as unused.
Remove the parameter from the callback type, declarations, implementations and generic invocation. Suggested-by: Bruce Richardson <[email protected]> Signed-off-by: Anatoly Burakov <[email protected]> Acked-by: Bruce Richardson <[email protected]> --- drivers/net/intel/ice/ice_acl_filter.c | 1 - drivers/net/intel/ice/ice_fdir_filter.c | 1 - drivers/net/intel/ice/ice_generic_flow.c | 2 +- drivers/net/intel/ice/ice_generic_flow.h | 1 - drivers/net/intel/ice/ice_hash.c | 2 -- drivers/net/intel/ice/ice_switch_filter.c | 1 - 6 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/intel/ice/ice_acl_filter.c b/drivers/net/intel/ice/ice_acl_filter.c index 9414bb3f122..08695b554f1 100644 --- a/drivers/net/intel/ice/ice_acl_filter.c +++ b/drivers/net/intel/ice/ice_acl_filter.c @@ -505,7 +505,6 @@ ice_acl_hw_rem_conf(struct ice_pf *pf, struct acl_rule *rule, int32_t entry_idx) static int ice_acl_create_filter(struct ice_adapter *ad, - struct rte_flow *flow __rte_unused, void *meta, struct rte_flow_error *error) { diff --git a/drivers/net/intel/ice/ice_fdir_filter.c b/drivers/net/intel/ice/ice_fdir_filter.c index f4c886dded3..e3f2cf2e3dd 100644 --- a/drivers/net/intel/ice/ice_fdir_filter.c +++ b/drivers/net/intel/ice/ice_fdir_filter.c @@ -1537,7 +1537,6 @@ ice_fdir_entry_del(struct ice_pf *pf, struct ice_fdir_fltr_pattern *key) static int ice_fdir_create_filter(struct ice_adapter *ad, - struct rte_flow *flow __rte_unused, void *meta, struct rte_flow_error *error) { diff --git a/drivers/net/intel/ice/ice_generic_flow.c b/drivers/net/intel/ice/ice_generic_flow.c index 25aa7aa41e2..f5ae6f7d013 100644 --- a/drivers/net/intel/ice/ice_generic_flow.c +++ b/drivers/net/intel/ice/ice_generic_flow.c @@ -2269,7 +2269,7 @@ ice_parse_engine_create(struct ice_adapter *ad, RTE_ASSERT(parser->engine->create != NULL); - if (parser->engine->create(ad, flow, meta, error) != 0) { + if (parser->engine->create(ad, meta, error) != 0) { ice_flow_rule_free(parser->engine, meta); return false; } diff --git a/drivers/net/intel/ice/ice_generic_flow.h b/drivers/net/intel/ice/ice_generic_flow.h index efb3ee9b695..ca0f7abe9aa 100644 --- a/drivers/net/intel/ice/ice_generic_flow.h +++ b/drivers/net/intel/ice/ice_generic_flow.h @@ -506,7 +506,6 @@ struct ice_flow_redirect { typedef int (*engine_init_t)(struct ice_adapter *ad); typedef void (*engine_uninit_t)(struct ice_adapter *ad); typedef int (*engine_create_t)(struct ice_adapter *ad, - struct rte_flow *flow, void *meta, struct rte_flow_error *error); typedef int (*engine_destroy_t)(struct ice_adapter *ad, diff --git a/drivers/net/intel/ice/ice_hash.c b/drivers/net/intel/ice/ice_hash.c index fe66b1dd5a6..980abb58f3b 100644 --- a/drivers/net/intel/ice/ice_hash.c +++ b/drivers/net/intel/ice/ice_hash.c @@ -82,7 +82,6 @@ ice_hash_init(struct ice_adapter *ad); static int ice_hash_create(struct ice_adapter *ad, - struct rte_flow *flow, void *meta, struct rte_flow_error *error); @@ -1314,7 +1313,6 @@ ice_hash_add_raw_cfg(struct ice_adapter *ad, static int ice_hash_create(struct ice_adapter *ad, - struct rte_flow *flow __rte_unused, void *meta, struct rte_flow_error *error) { diff --git a/drivers/net/intel/ice/ice_switch_filter.c b/drivers/net/intel/ice/ice_switch_filter.c index 4dd4707c406..59e18269206 100644 --- a/drivers/net/intel/ice/ice_switch_filter.c +++ b/drivers/net/intel/ice/ice_switch_filter.c @@ -285,7 +285,6 @@ ice_pattern_match_item ice_switch_supported_pattern[] = { static int ice_switch_create(struct ice_adapter *ad, - struct rte_flow *flow __rte_unused, void *meta, struct rte_flow_error *error) { -- 2.52.0
