diff options
| author |   Dave Ertman <david.m.ertman@intel.com> | 2019-04-16 10:24:29 -0700 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2019-05-23 10:51:53 -0700 |
| commit | e223eaec67e2e4b9092df3ee5344f46db6b3eded (patch) | |
| tree | 83311eff5533150fc15e91cdcb3cd6b86faf831b /drivers/net/ethernet/intel/ice/ice_main.c | |
| parent | ice: Call out dev/func caps when printing (diff) | |
| download | linux-dev-e223eaec67e2e4b9092df3ee5344f46db6b3eded.tar.xz linux-dev-e223eaec67e2e4b9092df3ee5344f46db6b3eded.zip | |
ice: Fix hang when ethtool disables FW LLDP
When disabling and enabling VSIs, there are a couple of flows
that recursively acquire the RTNL lock which causes a deadlock.
Fix that.
Signed-off-by: Dave Ertman <david.m.ertman@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index cbe8c5f2d953..65def2773313 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -2302,7 +2302,7 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent) ice_init_pf(pf); - err = ice_init_pf_dcb(pf); + err = ice_init_pf_dcb(pf, false); if (err) { clear_bit(ICE_FLAG_DCB_CAPABLE, pf->flags); clear_bit(ICE_FLAG_DCB_ENA, pf->flags); |