Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0edd2bdf authored by Mark Rustad's avatar Mark Rustad Committed by David S. Miller
Browse files

ixgbe: Fix up some ethtool results when adapter is removed 



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: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0391bbe3

drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

+8 −1
Original line number Diff line number Diff line 
/*******************************************************************************



  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,
@@ -1247,6 +1247,11 @@ static int ixgbe_link_test(struct ixgbe_adapter *adapter, u64 *data) 
	struct ixgbe_hw *hw = &adapter->hw;

	bool link_up;

	u32 link_speed = 0;



	if (ixgbe_removed(hw->hw_addr)) {

		*data = 1;

		return 1;

	}

	*data = 0;



	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[2] = 1;

		data[3] = 1;

		data[4] = 1;

		eth_test->flags |= ETH_TEST_FL_FAILED;

		return;

	}
@@ -1988,6 +1994,7 @@ static void ixgbe_diag_test(struct net_device *netdev, 
					data[1] = 1;

					data[2] = 1;

					data[3] = 1;

					data[4] = 1;

					eth_test->flags |= ETH_TEST_FL_FAILED;

					clear_bit(__IXGBE_TESTING,

						  &adapter->state);