Skip to content

Commit 4897313

Browse files
committed
Merge branch 'fs_enet-cleanup'
Maxime Chevallier says: ==================== net: ethernet: fs_enet: Cleanup and phylink conversion This is V3 of a series that cleans-up fs_enet, with the ultimate goal of converting it to phylink (patch 8). The main changes compared to V2 are : - Reviewed-by tags from Andrew were gathered - Patch 5 now includes the removal of now unused includes, thanks Andrew for spotting this - Patch 4 is new, it reworks the adjust_link to move the spinlock acquisition to a more suitable location. Although this dissapears in the actual phylink port, it makes the phylink conversion clearer on that point - Patch 8 includes fixes in the tx_timeout cancellation, to prevent taking rtnl twice when canceling a pending tx_timeout. Thanks Jakub for spotting this. Link to V2: https://lore.kernel.org/netdev/[email protected]/ Link to V1: https://lore.kernel.org/netdev/[email protected]/ ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents c259aca + 41f5fbf commit 4897313

File tree

8 files changed

+219
-307
lines changed

8 files changed

+219
-307
lines changed

drivers/net/ethernet/freescale/fs_enet/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ config FS_ENET
33
tristate "Freescale Ethernet Driver"
44
depends on NET_VENDOR_FREESCALE && (CPM1 || CPM2 || PPC_MPC512x)
55
select MII
6-
select PHYLIB
6+
select PHYLINK
77

88
config FS_ENET_MPC5121_FEC
99
def_bool y if (FS_ENET && PPC_MPC512x)

0 commit comments

Comments
 (0)