From patchwork Tue Jan 7 08:53:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 307558 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9FBE22C00D4 for ; Tue, 7 Jan 2014 19:53:09 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751929AbaAGIxE (ORCPT ); Tue, 7 Jan 2014 03:53:04 -0500 Received: from mail-bk0-f54.google.com ([209.85.214.54]:43681 "EHLO mail-bk0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750817AbaAGIxD (ORCPT ); Tue, 7 Jan 2014 03:53:03 -0500 Received: by mail-bk0-f54.google.com with SMTP id v16so138996bkz.27 for ; Tue, 07 Jan 2014 00:53:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=s4W+NXUmbzuT9rzvzh/qJ94QPtvoHQy9kxEZjORCXJk=; b=j1M80l7RZRCSuiEovxNTi9ibxt1KISdUyW6Gh4YJa6modGIdWVwkW6ki7TpWKqdyvm 3kNGlf6bN/+F06f4xlC9MIggtjhFlIDHBPZA8NVWbNwRJN6e1fO0D5OkXTOk6/tgdQ2F KvtlqG63WkZEE93mMJoi9Wu/ZTlXI4MkkgXxZJlcj4yC6FBhaXnKX2tc/YIY+2kAU+Vr 51G5adzCpcSz5xZdYx5ODOeROsCwkhxRhnt+XrQZT4LtftWO9eLxHnC2l1Whvatz1W8L QC9W3M6VdxaFfExL9LZVVXaNGRXRrlE09QnflX1pThH4iD8oT4JsMxU9xRyxve9JfMkx jeAw== MIME-Version: 1.0 X-Received: by 10.205.68.136 with SMTP id xy8mr171668bkb.137.1389084781360; Tue, 07 Jan 2014 00:53:01 -0800 (PST) Received: by 10.204.74.130 with HTTP; Tue, 7 Jan 2014 00:53:01 -0800 (PST) Date: Tue, 7 Jan 2014 16:53:01 +0800 Message-ID: Subject: [PATCH -next] i40evf: use pci drvdata correctly in i40evf_suspend() From: Wei Yongjun To: jeffrey.t.kirsher@intel.com, jesse.brandeburg@intel.com, bruce.w.allan@intel.com, carolyn.wyborny@intel.com, donald.c.skidmore@intel.com, gregory.v.rose@intel.com, alexander.h.duyck@intel.com, john.ronciak@intel.com, mitch.a.williams@intel.com Cc: yongjun_wei@trendmicro.com.cn, e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Yongjun We had set the pci driver-specific data in i40evf_probe() as a type of struct net_device, so we should use it as netdev in i40evf_resume(). Signed-off-by: Wei Yongjun --- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c index 06bf8253..a495ec4 100644 --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c @@ -2216,8 +2216,8 @@ static int i40evf_suspend(struct pci_dev *pdev, pm_message_t state) **/ static int i40evf_resume(struct pci_dev *pdev) { - struct i40evf_adapter *adapter = pci_get_drvdata(pdev); - struct net_device *netdev = adapter->netdev; + struct net_device *netdev = pci_get_drvdata(pdev); + struct i40evf_adapter *adapter = netdev_priv(netdev); u32 err; pci_set_power_state(pdev, PCI_D0);