ixgbe: Resolve null function pointer accesses on 82598 w/ multi-speed fiber

This change resolves some null function pointer accesses on 82598 when a
multi-speed fiber module is inserted into the adapter.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 38dd853403525fc456c7c4975206b51a62e9b1b2..def5c6e047cfb6a9a5ef4e130e32a5e3e26dac9e 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -3661,7 +3661,7 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
                ixgbe_configure_msi_and_legacy(adapter);
 
        /* enable the optics */
-       if (hw->phy.multispeed_fiber)
+       if (hw->phy.multispeed_fiber && hw->mac.ops.enable_tx_laser)
                hw->mac.ops.enable_tx_laser(hw);
 
        clear_bit(__IXGBE_DOWN, &adapter->state);
@@ -3973,7 +3973,7 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
        }
 
        /* power down the optics */
-       if (hw->phy.multispeed_fiber)
+       if (hw->phy.multispeed_fiber && hw->mac.ops.disable_tx_laser)
                hw->mac.ops.disable_tx_laser(hw);
 
        /* clear n-tuple filters that are cached */
@@ -7074,7 +7074,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
        }
 
        /* power down the optics */
-       if (hw->phy.multispeed_fiber)
+       if (hw->phy.multispeed_fiber && hw->mac.ops.disable_tx_laser)
                hw->mac.ops.disable_tx_laser(hw);
 
        init_timer(&adapter->watchdog_timer);