public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linux/drivers/net/ethernet/stmicro/stmmac
History
Antonio Borneo 12a8fe56c0 net: stmmac: fix incorrect merge of patch upstream 
Commit 7579262478 ("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: 7579262478 ("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>
2020-11-25 11:23:40 -08:00
..
altr_tse_pcs.c
altr_tse_pcs.h
chain_mode.c net: stmmac: Add support to Ethtool get/set ring parameters 2020-09-16 15:22:52 -07:00
common.h net: stmmac: Add option for VLAN filter fail queue enable 2020-09-25 16:48:33 -07:00
descs.h
descs_com.h
dwmac-anarion.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
dwmac-dwc-qos-eth.c
dwmac-generic.c
dwmac-imx.c net: ethernet: dwmac: remove redundant null check before clk_disable_unprepare() 2020-09-07 13:34:51 -07:00
dwmac-intel-plat.c net: stmmac: dwmac-intel-plat: fix error return code in intel_eth_plat_probe() 2020-11-16 15:32:30 -08:00
dwmac-intel.c stmmac: intel: Fix kernel panic on pci probe 2020-10-30 09:48:06 -07:00
dwmac-intel.h net: stmmac: Enable SERDES power up/down sequence 2020-04-21 15:54:45 -07:00
dwmac-ipq806x.c net: ethernet: stmmac: Disable hardware multicast filter 2020-08-12 13:12:52 -07:00
dwmac-lpc18xx.c
dwmac-mediatek.c
dwmac-meson.c
dwmac-meson8b.c net: stmmac: dwmac-meson8b: use clk_parent_data for clock registration 2020-06-26 12:17:29 -07:00
dwmac-oxnas.c
dwmac-qcom-ethqos.c net: stmmac: fix num_por initialization 2020-05-14 12:48:15 -07:00
dwmac-rk.c drivers/net/ethernet: clean up mis-targeted comments 2020-09-25 16:29:00 -07:00
dwmac-socfpga.c net: stmmac: fix enabling socfpga's ptp_ref_clock 2020-04-18 15:02:18 -07:00
dwmac-sti.c
dwmac-stm32.c net: ethernet: stmmac: simplify phy modes management for stm32 2020-05-01 15:17:32 -07:00
dwmac-sun8i.c
dwmac-sunxi.c net: stmmac: dwmac-sunxi: Provide TX and RX fifo sizes 2020-04-16 13:47:53 -07:00
dwmac4.h net: stmmac: Add option for VLAN filter fail queue enable 2020-09-25 16:48:33 -07:00
dwmac4_core.c net: stmmac: fix incorrect merge of patch upstream 2020-11-25 11:23:40 -08:00
dwmac4_descs.c net: stmmac: set get_rx_header_len() as void for it didn't have any error code to return 2020-09-11 14:37:34 -07:00
dwmac4_descs.h
dwmac4_dma.c
dwmac4_dma.h
dwmac4_lib.c
dwmac5.c net: stmmac: gmac5+: fix potential integer overflow on 32 bit multiply 2020-05-04 11:57:21 -07:00
dwmac5.h net: stmmac: Add option for VLAN filter fail queue enable 2020-09-25 16:48:33 -07:00
dwmac100.h
dwmac100_core.c
dwmac100_dma.c
dwmac1000.h
dwmac1000_core.c net: stmmac: dwmac1000: provide multicast filter fallback 2020-08-12 13:12:52 -07:00
dwmac1000_dma.c
dwmac_dma.h
dwmac_lib.c net: stmmac: dwmac_lib: enlarge dma reset timeout 2020-11-14 16:04:02 -08:00
dwxgmac2.h
dwxgmac2_core.c net: stmmac: xgmac: Fix VLAN register handling 2020-04-02 07:04:45 -07:00
dwxgmac2_descs.c net: stmmac: set get_rx_header_len() as void for it didn't have any error code to return 2020-09-11 14:37:34 -07:00
dwxgmac2_dma.c
dwxlgmac2.h
enh_desc.c
hwif.c
hwif.h net: stmmac: set get_rx_header_len() as void for it didn't have any error code to return 2020-09-11 14:37:34 -07:00
Kconfig net: pcs: Move XPCS into new PCS subdirectory 2020-08-27 06:55:50 -07:00
Makefile net: stmmac: Add dwmac-intel-plat for GBE driver 2020-08-26 15:52:30 -07:00
mmc.h
mmc_core.c
norm_desc.c
ring_mode.c net: stmmac: Add support to Ethtool get/set ring parameters 2020-09-16 15:22:52 -07:00
stmmac.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-10-05 18:40:01 -07:00
stmmac_ethtool.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-10-05 18:40:01 -07:00
stmmac_hwtstamp.c net: stmmac: Fix sub-second increment 2020-04-18 15:02:18 -07:00
stmmac_main.c net: stmmac: Use rtnl_lock/unlock on netif_set_real_num_rx_queues() call 2020-11-16 16:12:36 -08:00
stmmac_mdio.c
stmmac_pci.c stmmac: intel: Fix clock handling on error and remove paths 2020-04-30 12:50:15 -07:00
stmmac_pcs.h
stmmac_platform.c drivers/net/ethernet: clean up mis-targeted comments 2020-09-25 16:29:00 -07:00
stmmac_platform.h
stmmac_ptp.c
stmmac_ptp.h
stmmac_selftests.c net: stmmac: Add support to Ethtool get/set ring parameters 2020-09-16 15:22:52 -07:00
stmmac_tc.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00