summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBill Hayes <bill.hayes@hp.com>2008-02-19 10:24:41 -0800
committerJeff Garzik <jeff@garzik.org>2008-02-23 23:57:49 -0500
commit68707acb5b5d4e2b7583cbff0883516afed54d4f (patch)
treed8878f6e3e94999f9ccf67547e591ad844d85834 /drivers
parentcf7822983f21617b805712eec46eb31058508d6a (diff)
downloadlinux-stable-68707acb5b5d4e2b7583cbff0883516afed54d4f.tar.gz
linux-stable-68707acb5b5d4e2b7583cbff0883516afed54d4f.tar.bz2
linux-stable-68707acb5b5d4e2b7583cbff0883516afed54d4f.zip
igb: Fix panic with NICs with 1000BASE-SX PHY
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 <bill.hayes@hp.com> Signed-off-by: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/igb/igb_main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 3480cc72467a..6a1f23092099 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -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);
}
/**