Skip to content

Commit

Permalink
ixgbe: Resolve null function pointer accesses on 82598 w/ multi-speed…
Browse files Browse the repository at this point in the history
… 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>
  • Loading branch information
Alexander Duyck authored and Jeff Kirsher committed Nov 17, 2010
1 parent 2274543 commit e3de4b7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/ixgbe/ixgbe_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit e3de4b7

Please sign in to comment.