Merge branch 'stmmac-Frame-Preemption-fixes'

Jose Abreu says:

====================
net: stmmac: Frame Preemption fixes

Two single fixes for the -next tree for recently introduced Frame Preemption
feature.

1) and 2) fixes the disabling of Frame Preemption that was not being correctly
handled because of a missing return.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2020-01-10 11:29:44 -08:00
commit 916d08f640
2 changed files with 2 additions and 0 deletions

View File

@ -657,6 +657,7 @@ void dwmac5_fpe_configure(void __iomem *ioaddr, u32 num_txq, u32 num_rxq,
value &= ~EFPE;
writel(value, ioaddr + MAC_FPE_CTRL_STS);
return;
}
value = readl(ioaddr + GMAC_RXQ_CTRL1);

View File

@ -1421,6 +1421,7 @@ static void dwxgmac3_fpe_configure(void __iomem *ioaddr, u32 num_txq,
value &= ~XGMAC_EFPE;
writel(value, ioaddr + XGMAC_FPE_CTRL_STS);
return;
}
value = readl(ioaddr + XGMAC_RXQ_CTRL1);