Commit f2f99383 authored by Asbjørn Sloth Tønnesen's avatar Asbjørn Sloth Tønnesen Committed by Jakub Kicinski
Browse files

net: qede: use extack in qede_flow_parse_v4_common() 



Convert qede_flow_parse_v4_common() to take extack,
and drop the edev argument.

Convert DP_NOTICE call to use NL_SET_ERR_MSG_MOD instead.

Pass extack in calls to qede_flow_parse_ports() and
qede_set_v4_tuple_to_profile().

In calls to qede_flow_parse_v4_common(), use NULL as extack
for now, until a subsequent patch makes extack available.

Only compile tested.

Signed-off-by: default avatarAsbjørn Sloth Tønnesen <ast@fiberby.net>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240508143404.95901-6-ast@fiberby.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a62944d1

drivers/net/ethernet/qlogic/qede/qede_filter.c

+9 −7
Original line number Diff line number Diff line
@@ -1757,8 +1757,9 @@ qede_flow_parse_v6_common(struct flow_rule *rule, 
}



static int

qede_flow_parse_v4_common(struct qede_dev *edev, struct flow_rule *rule,

			struct qede_arfs_tuple *t)

qede_flow_parse_v4_common(struct flow_rule *rule,

			  struct qede_arfs_tuple *t,

			  struct netlink_ext_ack *extack)

{

	int err;
@@ -1768,7 +1769,8 @@ qede_flow_parse_v4_common(struct qede_dev *edev, struct flow_rule *rule, 
		flow_rule_match_ipv4_addrs(rule, &match);

		if ((match.key->src && match.mask->src != htonl(U32_MAX)) ||

		    (match.key->dst && match.mask->dst != htonl(U32_MAX))) {

			DP_NOTICE(edev, "Do not support ipv4 prefix/masks\n");

			NL_SET_ERR_MSG_MOD(extack,

					   "Do not support ipv4 prefix/masks");

			return -EINVAL;

		}
@@ -1776,11 +1778,11 @@ qede_flow_parse_v4_common(struct qede_dev *edev, struct flow_rule *rule, 
		t->dst_ipv4 = match.key->dst;

	}



	err = qede_flow_parse_ports(rule, t, NULL);

	err = qede_flow_parse_ports(rule, t, extack);

	if (err)

		return err;



	return qede_set_v4_tuple_to_profile(t, NULL);

	return qede_set_v4_tuple_to_profile(t, extack);

}



static int
@@ -1800,7 +1802,7 @@ qede_flow_parse_tcp_v4(struct qede_dev *edev, struct flow_rule *rule, 
	tuple->ip_proto = IPPROTO_TCP;

	tuple->eth_proto = htons(ETH_P_IP);



	return qede_flow_parse_v4_common(edev, rule, tuple);

	return qede_flow_parse_v4_common(rule, tuple, NULL);

}



static int
@@ -1820,7 +1822,7 @@ qede_flow_parse_udp_v4(struct qede_dev *edev, struct flow_rule *rule, 
	tuple->ip_proto = IPPROTO_UDP;

	tuple->eth_proto = htons(ETH_P_IP);



	return qede_flow_parse_v4_common(edev, rule, tuple);

	return qede_flow_parse_v4_common(rule, tuple, NULL);

}



static int