Message ID | 20240417140712.100905-1-ast@fiberby.net (mailing list archive) |
---|---|
State | Accepted |
Commit | bb534830a74f54037df923e15254e8c885dce35a |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next,v2] sfc: use flow_rule_is_supp_control_flags() | expand |
On 17/04/2024 15:07, Asbjørn Sloth Tønnesen wrote: > Change the check for unsupported control flags, to use the new helper > flow_rule_is_supp_control_flags(). > > Since the helper was based on sfc, then nothing really changes. > > Compile-tested, and compiled objects are identical. > > Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net> Reviewed-by: Edward Cree <ecree.xilinx@gmail.com>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 17 Apr 2024 14:07:10 +0000 you wrote: > Change the check for unsupported control flags, to use the new helper > flow_rule_is_supp_control_flags(). > > Since the helper was based on sfc, then nothing really changes. > > Compile-tested, and compiled objects are identical. > > [...] Here is the summary with links: - [net-next,v2] sfc: use flow_rule_is_supp_control_flags() https://git.kernel.org/netdev/net-next/c/bb534830a74f You are awesome, thank you!
diff --git a/drivers/net/ethernet/sfc/tc.c b/drivers/net/ethernet/sfc/tc.c index 82e8891a619a..9d140203e273 100644 --- a/drivers/net/ethernet/sfc/tc.c +++ b/drivers/net/ethernet/sfc/tc.c @@ -273,11 +273,10 @@ static int efx_tc_flower_parse_match(struct efx_nic *efx, match->value.ip_firstfrag = fm.key->flags & FLOW_DIS_FIRST_FRAG; match->mask.ip_firstfrag = true; } - if (fm.mask->flags & ~(FLOW_DIS_IS_FRAGMENT | FLOW_DIS_FIRST_FRAG)) { - NL_SET_ERR_MSG_FMT_MOD(extack, "Unsupported match on control.flags %#x", - fm.mask->flags); + if (!flow_rule_is_supp_control_flags(FLOW_DIS_IS_FRAGMENT | + FLOW_DIS_FIRST_FRAG, + fm.mask->flags, extack)) return -EOPNOTSUPP; - } } if (dissector->used_keys & ~(BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |
Change the check for unsupported control flags, to use the new helper flow_rule_is_supp_control_flags(). Since the helper was based on sfc, then nothing really changes. Compile-tested, and compiled objects are identical. Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net> --- Changelog: v2: - fix subject (noticed by Ed) - remove #define (requested by Ed) v1: https://lore.kernel.org/netdev/20240416134432.9527-1-ast@fiberby.net/ drivers/net/ethernet/sfc/tc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)