]> git.baikalelectronics.ru Git - kernel.git/commit
net: stmmac: fix incorrect merge of patch upstream
authorAntonio Borneo <antonio.borneo@st.com>
Tue, 24 Nov 2020 22:37:29 +0000 (23:37 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 25 Nov 2020 19:23:40 +0000 (11:23 -0800)
commit2cd5aaf5e26bd6bc88e73c2121355630d87e2190
tree4b28e555207f5ff9fb1691be451c7b8105e08bbe
parent665cbc5a5f7914dda43532ed819ea6f9985790ab
net: stmmac: fix incorrect merge of patch upstream

Commit b379f11a60fb ("net: stmmac: add flexible PPS to dwmac
4.10a") was intended to modify the struct dwmac410_ops, but it got
somehow badly merged and modified the struct dwmac4_ops.

Revert the modification in struct dwmac4_ops and re-apply it
properly in struct dwmac410_ops.

Fixes: b379f11a60fb ("net: stmmac: add flexible PPS to dwmac 4.10a")
Signed-off-by: Antonio Borneo <antonio.borneo@st.com>
Reported-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.kernel.org/r/20201124223729.886992-1-antonio.borneo@st.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c