Skip to content

Commit 916d08f

Browse files
committed
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 <[email protected]>
2 parents 7112f8b + e735def commit 916d08f

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,7 @@ void dwmac5_fpe_configure(void __iomem *ioaddr, u32 num_txq, u32 num_rxq,
657657
value &= ~EFPE;
658658

659659
writel(value, ioaddr + MAC_FPE_CTRL_STS);
660+
return;
660661
}
661662

662663
value = readl(ioaddr + GMAC_RXQ_CTRL1);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,6 +1421,7 @@ static void dwxgmac3_fpe_configure(void __iomem *ioaddr, u32 num_txq,
14211421
value &= ~XGMAC_EFPE;
14221422

14231423
writel(value, ioaddr + XGMAC_FPE_CTRL_STS);
1424+
return;
14241425
}
14251426

14261427
value = readl(ioaddr + XGMAC_RXQ_CTRL1);

0 commit comments

Comments
 (0)