Received: by 10.213.65.68 with SMTP id h4csp1721190imn; Mon, 19 Mar 2018 11:24:46 -0700 (PDT) X-Google-Smtp-Source: AG47ELuMMmTtvQNZk3KWZa2LJrh7OPH93MvuJ9ruowUOKq8IuCr6WfyXPe7ROjE+bc7EbnbcS5YV X-Received: by 2002:a17:902:8c83:: with SMTP id t3-v6mr3657469plo.391.1521483886095; Mon, 19 Mar 2018 11:24:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521483886; cv=none; d=google.com; s=arc-20160816; b=D+Usoeh0ZlCkbQEJW17wX8+P1IitRlXyJp4hYHseAmj42Vz1FBeILdY5yQc1V4HM33 sOssh+bTW9kD/ow7/N+dPs+zTvYYpfMfT1B0YRtODN83HADRQj7ERdgP7ClV+TEPFIY9 P1xZUG48zrfJ8cpp3l9fz7XXAOCWsRRfu6oDAr7owhaUhX2XGVwTgLRHcZIQvHaXWZxl Yp4XIUcc0w4HSeLDXd4Pmax00rTDYEzrjZ6oKKGQw5L/HJ36ikFXvxhx/316B1Vk4c7W fm8QqVlstJPoKWIR5cYt/vY+QfQsSSng9qqK+0qAH/CcQZISQboSfF6D+rmBX+NvNsWb X0pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=gfm1d0RFPSPms9YiXoURo1hjbFVYpdc4o6CjfhOF3UE=; b=V9IUkTzr1dMgR+KK7gQLpp8PmlK0gujfRSBj9+qXk5SWFMUIXLuLuWXBgt8G58NbQg k6BJGXbmZJ1pw6VWsWkahFl6+jFueDiK7UqrzSB84ILkfCavbzKiOB91GfLCUUrtcYsK hY6Nk5L0gExrZ7EPDKkv2SemZ0FdMSK2sAAOObcRV6PtiQ/N0cpWgmBBon6I+81wcGhu /6O8y8tfOstpMmaRwqZ3ej6ogN3NS4pcQpqA6TRYkea7B6/hRvuwYruJADKFr6mxRflL 6FxyNzXrNLsHbba2mRn6F/4CE9SKs2J+jo93YPi/sBPB6sPALAuIzh+GnrGoQeFrDiW8 hx9g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o68si337279pfk.132.2018.03.19.11.24.31; Mon, 19 Mar 2018 11:24:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031358AbeCSSXD (ORCPT + 99 others); Mon, 19 Mar 2018 14:23:03 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:48700 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967952AbeCSSWx (ORCPT ); Mon, 19 Mar 2018 14:22:53 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 359A212AD; Mon, 19 Mar 2018 18:22:51 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Phil Turnbull , Krishneil Singh , Jeff Kirsher , Sasha Levin Subject: [PATCH 4.9 112/241] fm10k: correctly check if interface is removed Date: Mon, 19 Mar 2018 19:06:17 +0100 Message-Id: <20180319180755.847150304@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Phil Turnbull [ 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 Tested-by: Krishneil Singh Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c @@ -942,7 +942,7 @@ static void fm10k_self_test(struct net_d 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;