From patchwork Mon Oct 12 13:27:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 270339 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DBAEC433DF for ; Mon, 12 Oct 2020 13:42:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D91C72074F for ; Mon, 12 Oct 2020 13:42:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510179; bh=NlpJeNZBIK7fYuWQZKrCfng+EtnxDeidHiBKJ7JZo0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dRbUeSRfElWsLumyr44uMtBD2PtcGEkTc9inAvb871iHuJ+AI4gRWtrPbCngtXLFQ 9CayORmNfU1V2xQ+fJY5YXrvUaQdxpkuzbuPGUQLMGmzx/cNeFGGmeAJTulfRRYwup eFsG0ze813O06y0fgnEs738lVEMOdwZ+x7kzhHQI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731352AbgJLNm5 (ORCPT ); Mon, 12 Oct 2020 09:42:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:47192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389210AbgJLNmU (ORCPT ); Mon, 12 Oct 2020 09:42:20 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5921D21BE5; Mon, 12 Oct 2020 13:42:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510138; bh=NlpJeNZBIK7fYuWQZKrCfng+EtnxDeidHiBKJ7JZo0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ybi8sIYOQ3O+Ieu6iw4wixJFKUqMcPSnghgiAP+WZMkhQ8teFzWpGBOJOEOkc3nGB q2erf9Sw1huVjHZ3P+Gh5BaFrm80EX2bVBFI+RGSH9bpJg9PFu+LTmhfyIc9zuqxRJ EVsbzKXJepvoHltSQgVJRL+A3+HzVl4EzXp2IPhw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sylwester Dziedziuch , Aleksandr Loktionov , Aaron Brown , Tony Nguyen , Sasha Levin Subject: [PATCH 5.4 57/85] iavf: Fix incorrect adapter get in iavf_resume Date: Mon, 12 Oct 2020 15:27:20 +0200 Message-Id: <20201012132635.603955116@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012132632.846779148@linuxfoundation.org> References: <20201012132632.846779148@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sylwester Dziedziuch [ Upstream commit 75598a8fc0e0dff2aa5d46c62531b36a595f1d4f ] When calling iavf_resume there was a crash because wrong function was used to get iavf_adapter and net_device pointers. Changed how iavf_resume is getting iavf_adapter and net_device pointers from pci_dev. Fixes: 5eae00c57f5e ("i40evf: main driver core") Signed-off-by: Sylwester Dziedziuch Reviewed-by: Aleksandr Loktionov Tested-by: Aaron Brown Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/iavf/iavf_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c index bcb95b2ea792f..cd95d6af8fc1b 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -3813,8 +3813,8 @@ static int __maybe_unused iavf_suspend(struct device *dev_d) static int __maybe_unused iavf_resume(struct device *dev_d) { struct pci_dev *pdev = to_pci_dev(dev_d); - struct iavf_adapter *adapter = pci_get_drvdata(pdev); - struct net_device *netdev = adapter->netdev; + struct net_device *netdev = pci_get_drvdata(pdev); + struct iavf_adapter *adapter = netdev_priv(netdev); u32 err; pci_set_master(pdev);