Commit 146817ec authored by Asbjørn Sloth Tønnesen's avatar Asbjørn Sloth Tønnesen Committed by Paolo Abeni
Browse files

net: qede: use return from qede_parse_actions() for flow_spec 



In qede_flow_spec_to_rule(), when calling
qede_parse_actions() then the return code
was only used for a non-zero check, and then
-EINVAL was returned.

qede_parse_actions() can currently fail with:
* -EINVAL
* -EOPNOTSUPP

Commit 319a1d19 ("flow_offload: check for
basic action hw stats type") broke the implicit
assumption that it could only fail with -EINVAL,
by changing it to return -EOPNOTSUPP, when hardware
stats are requested.

However AFAICT it's not possible to trigger
qede_parse_actions() to return -EOPNOTSUPP, when
called from qede_flow_spec_to_rule(), as hardware
stats can't be requested by ethtool_rx_flow_rule_create().

This patch changes qede_flow_spec_to_rule() to use
the actual return code from qede_parse_actions(),
so it's no longer assumed that all errors are -EINVAL.

Only compile tested.

Signed-off-by: default avatarAsbjørn Sloth Tønnesen <ast@fiberby.net>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 179a6f5d

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

+5 −2
Original line number Diff line number Diff line
@@ -1943,6 +1943,8 @@ static int qede_flow_spec_validate(struct qede_dev *edev, 
				   struct qede_arfs_tuple *t,

				   __u32 location)

{

	int err;



	if (location >= QEDE_RFS_MAX_FLTR) {

		DP_INFO(edev, "Location out-of-bounds\n");

		return -EINVAL;
@@ -1963,8 +1965,9 @@ static int qede_flow_spec_validate(struct qede_dev *edev, 
		return -EINVAL;

	}



	if (qede_parse_actions(edev, flow_action, NULL))

		return -EINVAL;

	err = qede_parse_actions(edev, flow_action, NULL);

	if (err)

		return err;



	return 0;

}