diff options
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_lib.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_lib.c | 8 | 
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c index b897926f817d..6d19c58ccacd 100644 --- a/drivers/net/ethernet/intel/ice/ice_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_lib.c @@ -1480,6 +1480,7 @@ static int ice_vsi_alloc_rings(struct ice_vsi *vsi)  		ring->tx_tstamps = &pf->ptp.port.tx;  		ring->dev = dev;  		ring->count = vsi->num_tx_desc; +		ring->txq_teid = ICE_INVAL_TEID;  		if (dvm_ena)  			ring->flags |= ICE_TX_FLAGS_RING_VLAN_L2TAG2;  		else @@ -2688,6 +2689,8 @@ void ice_vsi_free_irq(struct ice_vsi *vsi)  		return;  	vsi->irqs_ready = false; +	ice_free_cpu_rx_rmap(vsi); +  	ice_for_each_q_vector(vsi, i) {  		u16 vector = i + base;  		int irq_num; @@ -2701,7 +2704,8 @@ void ice_vsi_free_irq(struct ice_vsi *vsi)  			continue;  		/* clear the affinity notifier in the IRQ descriptor */ -		irq_set_affinity_notifier(irq_num, NULL); +		if (!IS_ENABLED(CONFIG_RFS_ACCEL)) +			irq_set_affinity_notifier(irq_num, NULL);  		/* clear the affinity_mask in the IRQ descriptor */  		irq_set_affinity_hint(irq_num, NULL); @@ -2983,6 +2987,8 @@ int ice_vsi_release(struct ice_vsi *vsi)  		}  	} +	if (ice_is_vsi_dflt_vsi(pf->first_sw, vsi)) +		ice_clear_dflt_vsi(pf->first_sw);  	ice_fltr_remove_all(vsi);  	ice_rm_vsi_lan_cfg(vsi->port_info, vsi->idx);  	err = ice_rm_vsi_rdma_cfg(vsi->port_info, vsi->idx);  | 
