diff options
| author | David S. Miller <davem@davemloft.net> | 2020-01-10 11:29:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-10 11:29:44 -0800 |
| commit | 916d08f640092397f403924f9b061d7d883a8217 (patch) | |
| tree | a2973e5cdcf933d7e07212db76266d359bf5131f | |
| parent | 7112f8b075b4565fb81bcd472433f9f1eea3dcb8 (diff) | |
| parent | e735def0186770d9a2904bee6ee82a4e6dd99578 (diff) | |
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>
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c index 5d4a3c2458ea..494c859b4ade 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c @@ -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); diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c index 307105e8dea0..2af3ac5409b7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c @@ -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); |