Skip to content

Commit

Permalink
net: qede: use extack in qede_flow_parse_v4_common()
Browse files Browse the repository at this point in the history
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: Asbjørn Sloth Tønnesen <ast@fiberby.net>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240508143404.95901-6-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 a62944d commit f2f9938
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions drivers/net/ethernet/qlogic/qede/qede_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -1768,19 +1769,20 @@ 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;
}

t->src_ipv4 = match.key->src;
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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit f2f9938

Please sign in to comment.