Skip to content

Commit

Permalink
net: qede: use extack in qede_flow_parse_v6_common()
Browse files Browse the repository at this point in the history
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: Asbjørn Sloth Tønnesen <ast@fiberby.net>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240508143404.95901-5-ast@fiberby.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Asbjørn Sloth Tønnesen authored and Jakub Kicinski committed May 11, 2024
1 parent f63a9dc commit a62944d
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions drivers/net/ethernet/qlogic/qede/qede_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1739,20 +1740,20 @@ 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;
}

memcpy(&t->src_ipv6, &match.key->src, sizeof(addr));
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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit a62944d

Please sign in to comment.