net: stmmac: fix incorrect merge of patch upstream (12a8fe56) · Commits · 戴 / test

Commit ("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: ("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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1171,7 +1171,6 @@ const struct stmmac_ops dwmac4_ops = {
		.pcs_get_adv_lp = dwmac4_get_adv_lp,
		.debug = dwmac4_debug,
		.set_filter = dwmac4_set_filter,
		.flex_pps_config = dwmac5_flex_pps_config,
		.set_mac_loopback = dwmac4_set_mac_loopback,
		.update_vlan_hash = dwmac4_update_vlan_hash,
		.sarc_configure = dwmac4_sarc_configure,
		@@ -1213,6 +1212,7 @@ const struct stmmac_ops dwmac410_ops = {
		.pcs_get_adv_lp = dwmac4_get_adv_lp,
		.debug = dwmac4_debug,
		.set_filter = dwmac4_set_filter,
		.flex_pps_config = dwmac5_flex_pps_config,
		.set_mac_loopback = dwmac4_set_mac_loopback,
		.update_vlan_hash = dwmac4_update_vlan_hash,
		.sarc_configure = dwmac4_sarc_configure,

Admin message