diff options
| author | Don Skidmore | 2014-02-28 05:32:43 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-02-28 18:40:57 +0100 |
| commit | c97506ab0e224613aa4fe9898f72d5e3eaf81772 (patch) | |
| tree | 78876ae5aa839b1ee5d68b6c16255c02e17f3c6a /drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | |
| parent | ixgbe: fix bit toggled for 82599 reset fix. (diff) | |
| download | kernel-qcow2-linux-c97506ab0e224613aa4fe9898f72d5e3eaf81772.tar.gz kernel-qcow2-linux-c97506ab0e224613aa4fe9898f72d5e3eaf81772.tar.xz kernel-qcow2-linux-c97506ab0e224613aa4fe9898f72d5e3eaf81772.zip | |
ixgbe: Add check for FW veto bit
The driver will now honor the MNG FW veto bit in blocking link resets.
This patch will affect x520 and x540 systems.
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h index fffcbdd2bf0e..b4d4323666b8 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h @@ -1,7 +1,7 @@ /******************************************************************************* Intel 10 Gigabit PCI Express Linux driver - Copyright(c) 1999 - 2013 Intel Corporation. + Copyright(c) 1999 - 2014 Intel Corporation. This program is free software; you can redistribute it and/or modify it under the terms and conditions of the GNU General Public License, @@ -131,6 +131,7 @@ s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw, s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed, bool *autoneg); +s32 ixgbe_check_reset_blocked(struct ixgbe_hw *hw); /* PHY specific */ s32 ixgbe_check_phy_link_tnx(struct ixgbe_hw *hw, |