| Message ID | 20170330074608.52108-3-jeffrey.t.kirsher@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Kirsher |
| Headers | show |
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@lists.osuosl.org] On > Behalf Of Jeff Kirsher > Sent: Thursday, March 30, 2017 12:46 AM > To: intel-wired-lan@lists.osuosl.org > Subject: [Intel-wired-lan] [next S65 3/3 v2] i40e: close client on remove and > shutdown > > From: Mitch Williams <mitch.a.williams@intel.com> > > When the driver is removed or shut down, close any attached clients (i.e. > i40iw). This prevents a panic seen sometimes on forced driver removal or > system shutdown when iWarp is running. > > Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> > Change-ID: I4f6161e5a73ffbb2fd5883567b007310302bfcb5 > --- > drivers/net/ethernet/intel/i40e/i40e_main.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index cb087d546a0a..da22850897c2 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -11392,6 +11392,11 @@ static void i40e_remove(struct pci_dev *pdev) if (pf->service_task.func) cancel_work_sync(&pf->service_task); + /* Client close must be called explicitly here because the timer + * has been stopped. + */ + i40e_notify_client_of_netdev_close(pf->vsi[pf->lan_vsi], false); + if (pf->flags & I40E_FLAG_SRIOV_ENABLED) { i40e_free_vfs(pf); pf->flags &= ~I40E_FLAG_SRIOV_ENABLED; @@ -11632,6 +11637,11 @@ static void i40e_shutdown(struct pci_dev *pdev) cancel_work_sync(&pf->service_task); i40e_fdir_teardown(pf); + /* Client close must be called explicitly here because the timer + * has been stopped. + */ + i40e_notify_client_of_netdev_close(pf->vsi[pf->lan_vsi], false); + if (pf->wol_en && (pf->flags & I40E_FLAG_WOL_MC_MAGIC_PKT_WAKE)) i40e_enable_mc_magic_wake(pf);