Commit 916d08f6 authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 7112f8b0 e735def0
...@@ -657,6 +657,7 @@ void dwmac5_fpe_configure(void __iomem *ioaddr, u32 num_txq, u32 num_rxq, ...@@ -657,6 +657,7 @@ void dwmac5_fpe_configure(void __iomem *ioaddr, u32 num_txq, u32 num_rxq,
value &= ~EFPE; value &= ~EFPE;
writel(value, ioaddr + MAC_FPE_CTRL_STS); writel(value, ioaddr + MAC_FPE_CTRL_STS);
return;
} }
value = readl(ioaddr + GMAC_RXQ_CTRL1); value = readl(ioaddr + GMAC_RXQ_CTRL1);
......
...@@ -1421,6 +1421,7 @@ static void dwxgmac3_fpe_configure(void __iomem *ioaddr, u32 num_txq, ...@@ -1421,6 +1421,7 @@ static void dwxgmac3_fpe_configure(void __iomem *ioaddr, u32 num_txq,
value &= ~XGMAC_EFPE; value &= ~XGMAC_EFPE;
writel(value, ioaddr + XGMAC_FPE_CTRL_STS); writel(value, ioaddr + XGMAC_FPE_CTRL_STS);
return;
} }
value = readl(ioaddr + XGMAC_RXQ_CTRL1); value = readl(ioaddr + XGMAC_RXQ_CTRL1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment