diff options
author | Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> | 2009-06-04 12:02:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-07 08:20:26 -0400 |
commit | 794caeb259bc5d341bcc80dd37820073147a231c (patch) | |
tree | c932f796a96c6c7dcd6611ef2c8425b644ad0458 /drivers/net/ixgbe/ixgbe_common.c | |
parent | ae540af18597a441bf17a26389179465ea4b9c36 (diff) |
ixgbe: Add FW detection and warning for 82599 SFP+ adapters
82599 has a FW running that helps manage the internal SFI PHY. There are
also a number of pre-production samples of these SFI-based devices in the
field. This patch adds a check to look for the firmware running on all
SFP+ based adapters, and displays a warning to the system log if a
pre-production adapter is identified. The driver will continue loading
though, with no functional degradation.
Also remove an old function prototype from ixgbe_82599.c that isn't being
used.
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_common.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_common.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c index db339d6fe63d..96a185953777 100644 --- a/drivers/net/ixgbe/ixgbe_common.c +++ b/drivers/net/ixgbe/ixgbe_common.c | |||
@@ -106,13 +106,17 @@ s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw) | |||
106 | **/ | 106 | **/ |
107 | s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw) | 107 | s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw) |
108 | { | 108 | { |
109 | s32 status; | ||
110 | |||
109 | /* Reset the hardware */ | 111 | /* Reset the hardware */ |
110 | hw->mac.ops.reset_hw(hw); | 112 | status = hw->mac.ops.reset_hw(hw); |
111 | 113 | ||
112 | /* Start the HW */ | 114 | if (status == 0) { |
113 | hw->mac.ops.start_hw(hw); | 115 | /* Start the HW */ |
116 | status = hw->mac.ops.start_hw(hw); | ||
117 | } | ||
114 | 118 | ||
115 | return 0; | 119 | return status; |
116 | } | 120 | } |
117 | 121 | ||
118 | /** | 122 | /** |