Commit a62944d1 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_v6_common() 



Convert qede_flow_parse_v6_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_v6_tuple_to_profile().

In calls to qede_flow_parse_v6_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-5-ast@fiberby.net


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

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

+9 −8
Original line number Diff line number Diff line
@@ -1722,8 +1722,9 @@ qede_flow_parse_ports(struct flow_rule *rule, struct qede_arfs_tuple *t, 
}



static int

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

			  struct qede_arfs_tuple *t)

qede_flow_parse_v6_common(struct flow_rule *rule,

			  struct qede_arfs_tuple *t,

			  struct netlink_ext_ack *extack)

{

	struct in6_addr zero_addr, addr;

	int err;
@@ -1739,8 +1740,8 @@ qede_flow_parse_v6_common(struct qede_dev *edev, struct flow_rule *rule, 
		     memcmp(&match.mask->src, &addr, sizeof(addr))) ||

		    (memcmp(&match.key->dst, &zero_addr, sizeof(addr)) &&

		     memcmp(&match.mask->dst, &addr, sizeof(addr)))) {

			DP_NOTICE(edev,

				  "Do not support IPv6 address prefix/mask\n");

			NL_SET_ERR_MSG_MOD(extack,

					   "Do not support IPv6 address prefix/mask");

			return -EINVAL;

		}
@@ -1748,11 +1749,11 @@ qede_flow_parse_v6_common(struct qede_dev *edev, struct flow_rule *rule, 
		memcpy(&t->dst_ipv6, &match.key->dst, sizeof(addr));

	}



	err = qede_flow_parse_ports(rule, t, NULL);

	err = qede_flow_parse_ports(rule, t, extack);

	if (err)

		return err;



	return qede_set_v6_tuple_to_profile(t, &zero_addr, NULL);

	return qede_set_v6_tuple_to_profile(t, &zero_addr, extack);

}



static int
@@ -1789,7 +1790,7 @@ qede_flow_parse_tcp_v6(struct qede_dev *edev, struct flow_rule *rule, 
	tuple->ip_proto = IPPROTO_TCP;

	tuple->eth_proto = htons(ETH_P_IPV6);



	return qede_flow_parse_v6_common(edev, rule, tuple);

	return qede_flow_parse_v6_common(rule, tuple, NULL);

}



static int
@@ -1809,7 +1810,7 @@ qede_flow_parse_udp_v6(struct qede_dev *edev, struct flow_rule *rule, 
	tuple->ip_proto = IPPROTO_UDP;

	tuple->eth_proto = htons(ETH_P_IPV6);



	return qede_flow_parse_v6_common(edev, rule, tuple);

	return qede_flow_parse_v6_common(rule, tuple, NULL);

}



static int