igb: Fix panic with NICs with 1000BASE-SX PHY
Subsystems (2)
PATCH 1/1 igb: Fix panic with NICs with 1000BASE-SX PHY
From: Bill Hayes <[email protected]>
This patch eliminates a kernel panic with the igb driver in 2.6.25-rc2 when running on a Intel 82575 Ethernet controller with a 1000BASE-SX PHY. The panic does not happen with the 1000BASE-T PHY, only with a SX connection.
---
drivers/net/igb/igb_main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/igb/igb_main.c +4 -2
@@ -816,7 +816,8 @@ void igb_reset(struct igb_adapter *adapter)wr32 (E1000_VET ,ETHERNET_IEEE_VLAN_TYPE );igb_reset_adaptive (&adapter->hw); - adapter->hw.phy.ops.get_phy_info (&adapter->hw); +if (adapter->hw.phy.ops.get_phy_info) + adapter->hw.phy.ops.get_phy_info (&adapter->hw); }/**
@@ -2052,7 +2053,8 @@ static void igb_set_multi(struct net_device *netdev)static void igb_update_phy_info (unsigned long data) {struct igb_adapter *adapter = (struct igb_adapter *) data; - adapter->hw.phy.ops.get_phy_info (&adapter->hw); +if (adapter->hw.phy.ops.get_phy_info) + adapter->hw.phy.ops.get_phy_info (&adapter->hw); }/**
Jeff Garzik
AppliedQuoted 9 lines · Auke Kok
From: Bill Hayes <[email protected]>
This patch eliminates a kernel panic with the igb driver in 2.6.25-rc2 when running on a Intel 82575 Ethernet controller with a 1000BASE-SX PHY. The panic does not happen with the 1000BASE-T PHY, only with a SX connection.
Signed-off-by Bill Hayes <[email protected]>Signed-off-by Andy Gospodarek <[email protected]>Signed-off-by Auke Kok <[email protected]>
applied
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/