|
@@ -4369,14 +4369,6 @@ static void i40e_quiesce_vsi(struct i40e_vsi *vsi)
|
|
|
if (test_bit(__I40E_DOWN, &vsi->state))
|
|
|
return;
|
|
|
|
|
|
- /* No need to disable FCoE VSI when Tx suspended */
|
|
|
- if ((test_bit(__I40E_PORT_TX_SUSPENDED, &vsi->back->state)) &&
|
|
|
- vsi->type == I40E_VSI_FCOE) {
|
|
|
- dev_dbg(&vsi->back->pdev->dev,
|
|
|
- "VSI seid %d skipping FCoE VSI disable\n", vsi->seid);
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
set_bit(__I40E_NEEDS_RESTART, &vsi->state);
|
|
|
if (vsi->netdev && netif_running(vsi->netdev))
|
|
|
vsi->netdev->netdev_ops->ndo_stop(vsi->netdev);
|
|
@@ -4479,8 +4471,7 @@ static int i40e_pf_wait_queues_disabled(struct i40e_pf *pf)
|
|
|
int v, ret = 0;
|
|
|
|
|
|
for (v = 0; v < pf->hw.func_caps.num_vsis; v++) {
|
|
|
- /* No need to wait for FCoE VSI queues */
|
|
|
- if (pf->vsi[v] && pf->vsi[v]->type != I40E_VSI_FCOE) {
|
|
|
+ if (pf->vsi[v]) {
|
|
|
ret = i40e_vsi_wait_queues_disabled(pf->vsi[v]);
|
|
|
if (ret)
|
|
|
break;
|
|
@@ -6968,8 +6959,7 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit)
|
|
|
goto end_core_reset;
|
|
|
|
|
|
ret = i40e_init_lan_hmc(hw, hw->func_caps.num_tx_qp,
|
|
|
- hw->func_caps.num_rx_qp,
|
|
|
- pf->fcoe_hmc_cntx_num, pf->fcoe_hmc_filt_num);
|
|
|
+ hw->func_caps.num_rx_qp, 0, 0);
|
|
|
if (ret) {
|
|
|
dev_info(&pf->pdev->dev, "init_lan_hmc failed: %d\n", ret);
|
|
|
goto end_core_reset;
|
|
@@ -11014,8 +11004,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
}
|
|
|
|
|
|
err = i40e_init_lan_hmc(hw, hw->func_caps.num_tx_qp,
|
|
|
- hw->func_caps.num_rx_qp,
|
|
|
- pf->fcoe_hmc_cntx_num, pf->fcoe_hmc_filt_num);
|
|
|
+ hw->func_caps.num_rx_qp, 0, 0);
|
|
|
if (err) {
|
|
|
dev_info(&pdev->dev, "init_lan_hmc failed: %d\n", err);
|
|
|
goto err_init_lan_hmc;
|