Skip to content

Commit

Permalink
net: qede: use extack in qede_flow_parse_ports()
Browse files Browse the repository at this point in the history
Convert qede_flow_parse_ports to use extack,
and drop the edev argument.

Convert DP_NOTICE call to use NL_SET_ERR_MSG_MOD instead.

In calls to qede_flow_parse_ports(), 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-2-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 d50729f commit a7c9540
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/net/ethernet/qlogic/qede/qede_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -1700,16 +1700,17 @@ static int qede_parse_actions(struct qede_dev *edev,
}

static int
qede_flow_parse_ports(struct qede_dev *edev, struct flow_rule *rule,
struct qede_arfs_tuple *t)
qede_flow_parse_ports(struct flow_rule *rule, struct qede_arfs_tuple *t,
struct netlink_ext_ack *extack)
{
if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_PORTS)) {
struct flow_match_ports match;

flow_rule_match_ports(rule, &match);
if ((match.key->src && match.mask->src != htons(U16_MAX)) ||
(match.key->dst && match.mask->dst != htons(U16_MAX))) {
DP_NOTICE(edev, "Do not support ports masks\n");
NL_SET_ERR_MSG_MOD(extack,
"Do not support ports masks");
return -EINVAL;
}

Expand Down Expand Up @@ -1747,7 +1748,7 @@ 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(edev, rule, t);
err = qede_flow_parse_ports(rule, t, NULL);
if (err)
return err;

Expand All @@ -1774,7 +1775,7 @@ qede_flow_parse_v4_common(struct qede_dev *edev, struct flow_rule *rule,
t->dst_ipv4 = match.key->dst;
}

err = qede_flow_parse_ports(edev, rule, t);
err = qede_flow_parse_ports(rule, t, NULL);
if (err)
return err;

Expand Down

0 comments on commit a7c9540

Please sign in to comment.