From 1dbd240d8e4299b7c9d2acf30d39f3b242e63051 Mon Sep 17 00:00:00 2001 From: Bill Hayes Date: Tue, 19 Feb 2008 10:24:41 -0800 Subject: [PATCH] --- yaml --- r: 86447 b: refs/heads/master c: 68707acb5b5d4e2b7583cbff0883516afed54d4f h: refs/heads/master i: 86445: 0ddde4ca82a0035b1cb7d35d00b34c008f8b49fe 86443: b8ac57df3ab6eb532edcb14f694a30447aa0d5b0 86439: 7e20e901d3e78e0544c9225efbf2ce1d64a4db0b 86431: ab75be4b1613ca0b52c0f16536a2e0b2b8a7c357 v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_main.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4a1fbacd036c..042d152a2062 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf7822983f21617b805712eec46eb31058508d6a +refs/heads/master: 68707acb5b5d4e2b7583cbff0883516afed54d4f diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c index 3480cc72467a..6a1f23092099 100644 --- a/trunk/drivers/net/igb/igb_main.c +++ b/trunk/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); } /**