sfc: use flow_rule_no_unsupp_control_flags()
Subsystems (3)
PATCH 1/1 sfc: use flow_rule_no_unsupp_control_flags()
Adopt nfp-style *_FLOWER_SUPPORTED_CTLFLAGS define.
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.
--- drivers/net/ethernet/sfc/tc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/ethernet/sfc/tc.c +6 -4
@@ -21,6 +21,10 @@#include "ef100_rep.h" #include "efx.h" +#define SFC_FLOWER_SUPPORTED_CTLFLAGS \ + (FLOW_DIS_IS_FRAGMENT | \ + FLOW_DIS_FIRST_FRAG) +enum efx_encap_type efx_tc_indr_netdev_type (struct net_device *net_dev) {if (netif_is_vxlan (net_dev))
@@ -273,11 +277,9 @@ 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 (SFC_FLOWER_SUPPORTED_CTLFLAGS , + fm.mask->flags, extack))return -EOPNOTSUPP ; - } } if (dissector->used_keys & ~(BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |
Signature · 1 line
2.43.0
Edward Cree
maintainerQuoted 10 lines · Asbjørn Sloth Tønnesen
Adopt nfp-style
*_FLOWER_SUPPORTED_CTLFLAGSdefine.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 <[email protected]>
Subject line doesn't match the patch (I guess because the helper
got renamed).
Quoted 9 lines
--- drivers/net/ethernet/sfc/tc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/net/ethernet/sfc/tc.c +0
-0
drivers/net/ethernet/sfc/tc.c line 26
Quoted 6 lines
drivers/net/ethernet/sfc/tc.c +3
-0@@ -21,6 +21,10 @@#include "ef100_rep.h" #include "efx.h" +#define SFC_FLOWER_SUPPORTED_CTLFLAGS \ + (FLOW_DIS_IS_FRAGMENT | \ + FLOW_DIS_FIRST_FRAG)
I'd rather keep the flags in-line, next to where they're actually
used. I.e. we have
if (flags & FRAGMENT)
blah;
if (flags & FIRST_FRAG)
foo;
if (!blah_supported(FRAGMENT | FIRST_FRAG))
return -EEK;
and it's very clear that anyone changing one of those parts also needs to change the other. Whereas with your #define it's not immediately obvious to someone reading the code where that set of supported flags comes from conceptually.
-ed
Hi Ed,
Quoted 6 lines · Edward Cree
Quoted 5 lines · Asbjørn Sloth Tønnesen
Adopt nfp-style
*_FLOWER_SUPPORTED_CTLFLAGSdefine.Change the check for unsupported control flags, to use the new helper
flow_rule_is_supp_control_flags().
Quoted 8 lines
Quoted 5 lines
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 <[email protected]>Subject line doesn't match the patch (I guess because the helper
got renamed).
Correct, through I had fixed it everywhere. Apparently I missed one.
Quoted 12 lines
Quoted 12 lines
--- drivers/net/ethernet/sfc/tc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/net/ethernet/sfc/tc.c +0
-0@@ -21,6 +21,10 @@#include "ef100_rep.h" #include "efx.h"
Quoted 16 lines
drivers/net/ethernet/sfc/tc.c line 26
Quoted 3 lines
drivers/net/ethernet/sfc/tc.c +3
-0+#define SFC_FLOWER_SUPPORTED_CTLFLAGS \ + (FLOW_DIS_IS_FRAGMENT | \ + FLOW_DIS_FIRST_FRAG)I'd rather keep the flags in-line, next to where they're actually
used. I.e. we have
if (flags & FRAGMENT)
blah;
if (flags &FIRST_FRAG)
foo;
if (!blah_supported(FRAGMENT |FIRST_FRAG))
return-EEK;
and it's very clear that anyone changing one of those parts also needs to change the other. Whereas with your #define it's not immediately obvious to someone reading the code where that set of supported flags comes from conceptually.
Ok, I liked the NFP-style #define, but will drop trying to expand that.
pw-bot: changes-requested
Signature · 4 lines
Best regards Asbjørn Sloth Tønnesen Network Engineer Fiberby - AS42541