diff options
| author | Paul Greenwalt <paul.greenwalt@intel.com> | 2017-04-21 05:37:13 -0400 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2017-05-31 07:31:43 -0400 |
| commit | 5e999fb43ebb5a64554890cda57edc1edd68a2ab (patch) | |
| tree | 63eecb8f0a85273c87187de8901f5425d7fba2ab /drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | |
| parent | b09457e7a1d6e8d311b5342475d267087c4970a6 (diff) | |
ixgbe: Remove MAC X550EM_X 1Gbase-t led_[on|off] support
Since FW configures the PHY and MAC X550EM_X has no
PHY access, led_[on|off] is not supported with the 1Gbase-t design.
Removed MAC X550EM_X 1Gbase-t led_[on|off] support by setting
function pointers to NULL and added NULL pointer checks. Also set
init_led_link_act to NULL and added NULL pointer check.
Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_common.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c index c38d50c1fcf7..3af6127f0d44 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | |||
| @@ -395,7 +395,8 @@ s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw) | |||
| 395 | } | 395 | } |
| 396 | 396 | ||
| 397 | /* Initialize the LED link active for LED blink support */ | 397 | /* Initialize the LED link active for LED blink support */ |
| 398 | hw->mac.ops.init_led_link_act(hw); | 398 | if (hw->mac.ops.init_led_link_act) |
| 399 | hw->mac.ops.init_led_link_act(hw); | ||
| 399 | 400 | ||
| 400 | return status; | 401 | return status; |
| 401 | } | 402 | } |