diff options
| author | Jakub Kicinski <[email protected]> | 2024-09-06 03:27:09 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-09-06 03:37:20 +0000 |
| commit | 502cc061de6692a9a8ca9bcf486de78e2664e869 (patch) | |
| tree | 16a6c1b6c40936c59bd6dee4c1de918789094ee0 /drivers/net/ethernet/intel/igc/igc_main.c | |
| parent | netlink: specs: nftables: allow decode of tailscale ruleset (diff) | |
| parent | Merge tag 'net-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | kernel-502cc061de6692a9a8ca9bcf486de78e2664e869.tar.gz kernel-502cc061de6692a9a8ca9bcf486de78e2664e869.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
drivers/net/phy/phy_device.c
2560db6ede1a ("net: phy: Fix missing of_node_put() for leds")
1dce520abd46 ("net: phy: Use for_each_available_child_of_node_scoped()")
https://lore.kernel.org/[email protected]
Adjacent changes:
drivers/net/ethernet/xilinx/xilinx_axienet.h
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
858430db28a5 ("net: xilinx: axienet: Fix race in axienet_stop")
76abb5d675c4 ("net: xilinx: axienet: Add statistics support")
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/igc/igc_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igc/igc_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index da322899e834..6e70bca15db1 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -7504,6 +7504,7 @@ static void igc_io_resume(struct pci_dev *pdev) rtnl_lock(); if (netif_running(netdev)) { if (igc_open(netdev)) { + rtnl_unlock(); netdev_err(netdev, "igc_open failed after reset\n"); return; } |