summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
diff options
context:
space:
mode:
authorJean Sacren2014-03-11 06:57:56 +0100
committerJeff Kirsher2014-04-01 00:48:01 +0200
commit6425f0f353b91c2edad65a7e7d1362d1787d26fd (patch)
tree0636f839bc9e9c2a7f21fce5997ddde6b30823a1 /drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
parentixgbe: fix race conditions on queuing skb for HW time stamp (diff)
downloadkernel-qcow2-linux-6425f0f353b91c2edad65a7e7d1362d1787d26fd.tar.gz
kernel-qcow2-linux-6425f0f353b91c2edad65a7e7d1362d1787d26fd.tar.xz
kernel-qcow2-linux-6425f0f353b91c2edad65a7e7d1362d1787d26fd.zip
ixgbe: fix ixgbe_check_reset_blocked() declaration
The commit c97506ab0e22 ("ixgbe: Add check for FW veto bit") introduced the new function ixgbe_check_reset_blocked() with a minor issue in declaration. Fix the declaration by changing the type specifier to bool as the definition returns a boolean value. Additionally all ixgbe_check_reset_blocked() callers are expected to return a boolean value. Signed-off-by: Jean Sacren <sakiwit@gmail.com> Acked-by: Don Skidmore <donald.c.skidmore@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index ad51c12cb26a..23f765263f12 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -107,7 +107,7 @@ s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw)
* have this bit just return false since the link can not be blocked
* via this method.
**/
-s32 ixgbe_check_reset_blocked(struct ixgbe_hw *hw)
+bool ixgbe_check_reset_blocked(struct ixgbe_hw *hw)
{
u32 mmngc;