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>
This commit is contained in:
parent
cf7822983f
commit
68707acb5b
|
@ -816,7 +816,8 @@ void igb_reset(struct igb_adapter *adapter)
|
||||||
wr32(E1000_VET, ETHERNET_IEEE_VLAN_TYPE);
|
wr32(E1000_VET, ETHERNET_IEEE_VLAN_TYPE);
|
||||||
|
|
||||||
igb_reset_adaptive(&adapter->hw);
|
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)
|
static void igb_update_phy_info(unsigned long data)
|
||||||
{
|
{
|
||||||
struct igb_adapter *adapter = (struct igb_adapter *) 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue