leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ixgbe: Fix up some ethtool results when adapter is removed

Browse Source 
Some ethtool tests returned apparently good results when the
adapter was in a removed state. Fix that by checking for removal.
This also fixes two paths that could return uninitialized memory
in data[4].

Signed-off-by: Mark Rustad <mark.d.rustad@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>
This commit is contained in:
Mark Rustad 2014-02-28 15:48:56 -08:00 committed by David S. Miller
parent 0391bbe3e4
commit 0edd2bdf63
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
View File

@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
Intel 10 Gigabit PCI Express Linux driver 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 This program is free software; you can redistribute it and/or modify it
under the terms and conditions of the GNU General Public License, under the terms and conditions of the GNU General Public License,
@ -1247,6 +1247,11 @@ static int ixgbe_link_test(struct ixgbe_adapter *adapter, u64 *data)
struct ixgbe_hw *hw = &adapter->hw; struct ixgbe_hw *hw = &adapter->hw;
bool link_up; bool link_up;
u32 link_speed = 0; u32 link_speed = 0;
if (ixgbe_removed(hw->hw_addr)) {
*data = 1;
return 1;
}
*data = 0; *data = 0;
hw->mac.ops.check_link(hw, &link_speed, &link_up, true); hw->mac.ops.check_link(hw, &link_speed, &link_up, true);
@ -1969,6 +1974,7 @@ static void ixgbe_diag_test(struct net_device *netdev,
data[1] = 1; data[1] = 1;
data[2] = 1; data[2] = 1;
data[3] = 1; data[3] = 1;
data[4] = 1;
eth_test->flags |= ETH_TEST_FL_FAILED; eth_test->flags |= ETH_TEST_FL_FAILED;
return; return;
} }
@ -1988,6 +1994,7 @@ static void ixgbe_diag_test(struct net_device *netdev,
data[1] = 1; data[1] = 1;
data[2] = 1; data[2] = 1;
data[3] = 1; data[3] = 1;
data[4] = 1;
eth_test->flags |= ETH_TEST_FL_FAILED; eth_test->flags |= ETH_TEST_FL_FAILED;
clear_bit(__IXGBE_TESTING, clear_bit(__IXGBE_TESTING,
&adapter->state); &adapter->state);