Commit e715d745 authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller
Browse files

net: stmmac: selftests: Update status when disabling RSS 



We are disabling RSS on HW but not updating the internal private status
to the 'disabled' state. This is needed for next tc commit that will
check if RSS is disabled before trying to apply filters.

Fixes: 4647e021 ("net: stmmac: selftests: Add selftest for L3/L4 Filters")
Signed-off-by: default avatarJose Abreu <Jose.Abreu@synopsys.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db885e66

drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c

+14 −6
Original line number Diff line number Diff line
@@ -1323,16 +1323,19 @@ static int __stmmac_test_l3filt(struct stmmac_priv *priv, u32 dst, u32 src, 
	struct stmmac_packet_attrs attr = { };

	struct flow_dissector *dissector;

	struct flow_cls_offload *cls;

	int ret, old_enable = 0;

	struct flow_rule *rule;

	int ret;



	if (!tc_can_offload(priv->dev))

		return -EOPNOTSUPP;

	if (!priv->dma_cap.l3l4fnum)

		return -EOPNOTSUPP;

	if (priv->rss.enable)

	if (priv->rss.enable) {

		old_enable = priv->rss.enable;

		priv->rss.enable = false;

		stmmac_rss_configure(priv, priv->hw, NULL,

				     priv->plat->rx_queues_to_use);

	}



	dissector = kzalloc(sizeof(*dissector), GFP_KERNEL);

	if (!dissector) {
@@ -1399,7 +1402,8 @@ static int __stmmac_test_l3filt(struct stmmac_priv *priv, u32 dst, u32 src, 
cleanup_dissector:

	kfree(dissector);

cleanup_rss:

	if (priv->rss.enable) {

	if (old_enable) {

		priv->rss.enable = old_enable;

		stmmac_rss_configure(priv, priv->hw, &priv->rss,

				     priv->plat->rx_queues_to_use);

	}
@@ -1444,16 +1448,19 @@ static int __stmmac_test_l4filt(struct stmmac_priv *priv, u32 dst, u32 src, 
	struct stmmac_packet_attrs attr = { };

	struct flow_dissector *dissector;

	struct flow_cls_offload *cls;

	int ret, old_enable = 0;

	struct flow_rule *rule;

	int ret;



	if (!tc_can_offload(priv->dev))

		return -EOPNOTSUPP;

	if (!priv->dma_cap.l3l4fnum)

		return -EOPNOTSUPP;

	if (priv->rss.enable)

	if (priv->rss.enable) {

		old_enable = priv->rss.enable;

		priv->rss.enable = false;

		stmmac_rss_configure(priv, priv->hw, NULL,

				     priv->plat->rx_queues_to_use);

	}



	dissector = kzalloc(sizeof(*dissector), GFP_KERNEL);

	if (!dissector) {
@@ -1525,7 +1532,8 @@ static int __stmmac_test_l4filt(struct stmmac_priv *priv, u32 dst, u32 src, 
cleanup_dissector:

	kfree(dissector);

cleanup_rss:

	if (priv->rss.enable) {

	if (old_enable) {

		priv->rss.enable = old_enable;

		stmmac_rss_configure(priv, priv->hw, &priv->rss,

				     priv->plat->rx_queues_to_use);

	}