Skip to content

Commit a62944d

Browse files
Asbjørn Sloth Tønnesenkuba-moo
authored andcommitted
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: Asbjørn Sloth Tønnesen <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent f63a9dc commit a62944d

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,8 +1722,9 @@ qede_flow_parse_ports(struct flow_rule *rule, struct qede_arfs_tuple *t,
17221722
}
17231723

17241724
static int
1725-
qede_flow_parse_v6_common(struct qede_dev *edev, struct flow_rule *rule,
1726-
struct qede_arfs_tuple *t)
1725+
qede_flow_parse_v6_common(struct flow_rule *rule,
1726+
struct qede_arfs_tuple *t,
1727+
struct netlink_ext_ack *extack)
17271728
{
17281729
struct in6_addr zero_addr, addr;
17291730
int err;
@@ -1739,20 +1740,20 @@ qede_flow_parse_v6_common(struct qede_dev *edev, struct flow_rule *rule,
17391740
memcmp(&match.mask->src, &addr, sizeof(addr))) ||
17401741
(memcmp(&match.key->dst, &zero_addr, sizeof(addr)) &&
17411742
memcmp(&match.mask->dst, &addr, sizeof(addr)))) {
1742-
DP_NOTICE(edev,
1743-
"Do not support IPv6 address prefix/mask\n");
1743+
NL_SET_ERR_MSG_MOD(extack,
1744+
"Do not support IPv6 address prefix/mask");
17441745
return -EINVAL;
17451746
}
17461747

17471748
memcpy(&t->src_ipv6, &match.key->src, sizeof(addr));
17481749
memcpy(&t->dst_ipv6, &match.key->dst, sizeof(addr));
17491750
}
17501751

1751-
err = qede_flow_parse_ports(rule, t, NULL);
1752+
err = qede_flow_parse_ports(rule, t, extack);
17521753
if (err)
17531754
return err;
17541755

1755-
return qede_set_v6_tuple_to_profile(t, &zero_addr, NULL);
1756+
return qede_set_v6_tuple_to_profile(t, &zero_addr, extack);
17561757
}
17571758

17581759
static int
@@ -1789,7 +1790,7 @@ qede_flow_parse_tcp_v6(struct qede_dev *edev, struct flow_rule *rule,
17891790
tuple->ip_proto = IPPROTO_TCP;
17901791
tuple->eth_proto = htons(ETH_P_IPV6);
17911792

1792-
return qede_flow_parse_v6_common(edev, rule, tuple);
1793+
return qede_flow_parse_v6_common(rule, tuple, NULL);
17931794
}
17941795

17951796
static int
@@ -1809,7 +1810,7 @@ qede_flow_parse_udp_v6(struct qede_dev *edev, struct flow_rule *rule,
18091810
tuple->ip_proto = IPPROTO_UDP;
18101811
tuple->eth_proto = htons(ETH_P_IPV6);
18111812

1812-
return qede_flow_parse_v6_common(edev, rule, tuple);
1813+
return qede_flow_parse_v6_common(rule, tuple, NULL);
18131814
}
18141815

18151816
static int

0 commit comments

Comments
 (0)