]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
fm10k: correctly check if interface is removed
authorPhil Turnbull <phil.turnbull@oracle.com>
Wed, 23 Nov 2016 18:33:58 +0000 (13:33 -0500)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:33:44 +0000 (21:33 -0400)
[ Upstream commit 540fca35e38d15777b310f450f63f056e63039f5 ]

FM10K_REMOVED expects a hardware address, not a 'struct fm10k_hw'.

Fixes: 5cb8db4a4cbc ("fm10k: Add support for VF")
Signed-off-by: Phil Turnbull <phil.turnbull@oracle.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c

index 4b9d9f88af706760ab7484401e1c4000eb68087c..502a54e9ac332ce1659fb789d09e86255fa6610a 100644 (file)
@@ -869,7 +869,7 @@ static void fm10k_self_test(struct net_device *dev,
 
        memset(data, 0, sizeof(*data) * FM10K_TEST_LEN);
 
-       if (FM10K_REMOVED(hw)) {
+       if (FM10K_REMOVED(hw->hw_addr)) {
                netif_err(interface, drv, dev,
                          "Interface removed - test blocked\n");
                eth_test->flags |= ETH_TEST_FL_FAILED;