| Message ID | 20200902125459.30641-1-mateusz.palczewski@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Anthony Nguyen |
| Headers | show |
| Series | iavf-linux: Fix incorrect adapter get in iavf_resume | expand |
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of > Mateusz Palczewski > Sent: Wednesday, September 2, 2020 5:55 AM > To: intel-wired-lan@lists.osuosl.org > Cc: Dziedziuch, SylwesterX <sylwesterx.dziedziuch@intel.com> > Subject: [Intel-wired-lan] [PATCH] iavf-linux: Fix incorrect adapter get in > iavf_resume > > From: Sylwester Dziedziuch <sylwesterx.dziedziuch@intel.com> > > 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. > > Signed-off-by: Sylwester Dziedziuch <sylwesterx.dziedziuch@intel.com> > Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com> > --- > drivers/net/ethernet/intel/iavf/iavf_main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Tested-by: Aaron Brown <aaron.f.brown@intel.com>
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c index d870343cf..cf539db79 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -3806,8 +3806,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);