Re: [PATCH net-next 1/2] net: lan966x: cleanup lan966x_tc_flower_handler_control_usage()

[Jiri Pirko <jiri@resnulli.us>]

Tue, Apr 23, 2024 at 12:27:17PM CEST, ast@fiberby.net wrote:
>Define extack locally, to reduce line lengths and future users.
>
>Rename goto, as the error message is specific to the fragment flags.

2 changes, 2 patches?

>
>Only compile-tested.
>
>Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
>---
> .../net/ethernet/microchip/lan966x/lan966x_tc_flower.c   | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c b/drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c
>index d696cf9dbd19..8baec0cd8d95 100644
>--- a/drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c
>+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c
>@@ -45,6 +45,7 @@ static bool lan966x_tc_is_known_etype(struct vcap_tc_flower_parse_usage *st,
> static int
> lan966x_tc_flower_handler_control_usage(struct vcap_tc_flower_parse_usage *st)
> {
>+	struct netlink_ext_ack *extack = st->fco->common.extack;
> 	struct flow_match_control match;
> 	int err = 0;
> 
>@@ -59,7 +60,7 @@ lan966x_tc_flower_handler_control_usage(struct vcap_tc_flower_parse_usage *st)
> 						    VCAP_KF_L3_FRAGMENT,
> 						    VCAP_BIT_0);
> 		if (err)
>-			goto out;
>+			goto bad_frag_out;
> 	}
> 
> 	if (match.mask->flags & FLOW_DIS_FIRST_FRAG) {
>@@ -72,15 +73,15 @@ lan966x_tc_flower_handler_control_usage(struct vcap_tc_flower_parse_usage *st)
> 						    VCAP_KF_L3_FRAG_OFS_GT0,
> 						    VCAP_BIT_1);
> 		if (err)
>-			goto out;
>+			goto bad_frag_out;
> 	}
> 
> 	st->used_keys |= BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL);
> 
> 	return err;
> 
>-out:
>-	NL_SET_ERR_MSG_MOD(st->fco->common.extack, "ip_frag parse error");
>+bad_frag_out:
>+	NL_SET_ERR_MSG_MOD(extack, "ip_frag parse error");
> 	return err;
> }
> 
>-- 
>2.43.0
>
>