igb: do not use phy ops in ethtool test cleanup for non-copper parts

Currently the igb driver is experiencing a panic due to a null function
pointer being used during the cleanup of the ethtool looback test on
fiber/serdes parts.  This patch prevents that and adds a check prior to
calling any phy function.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 32 insertions, 0 deletions

diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h
index acf2569b98f4..2121b8bc6ea7 100644
--- a/drivers/net/igb/igb.h
+++ b/drivers/net/igb/igb.h
@@ -332,4 +332,36 @@ extern void igb_free_rx_resources(struct igb_ring *);
 extern void igb_update_stats(struct igb_adapter *);
 extern void igb_set_ethtool_ops(struct net_device *);
 
+static inline s32 igb_reset_phy(struct e1000_hw *hw)
+{
+        if (hw->phy.ops.reset_phy)
+                return hw->phy.ops.reset_phy(hw);
+
+        return 0;
+}
+
+static inline s32 igb_read_phy_reg(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+        if (hw->phy.ops.read_phy_reg)
+                return hw->phy.ops.read_phy_reg(hw, offset, data);
+
+        return 0;
+}
+
+static inline s32 igb_write_phy_reg(struct e1000_hw *hw, u32 offset, u16 data)
+{
+        if (hw->phy.ops.write_phy_reg)
+                return hw->phy.ops.write_phy_reg(hw, offset, data);
+
+        return 0;
+}
+
+static inline s32 igb_get_phy_info(struct e1000_hw *hw)
+{
+        if (hw->phy.ops.get_phy_info)
+                return hw->phy.ops.get_phy_info(hw);
+
+        return 0;
+}
+
 #endif /* _IGB_H_ */