Commit b414020f authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2023-12-18 (ice)

This series contains updates to ice driver only.

Jakes stops clearing of needed aggregator information.

Dave adds a check for LAG device support before initializing the
associated event handler.

Larysa restores accounting of XDP queues in TC configurations.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  ice: Fix PF with enabled XDP going no-carrier after reset
  ice: alter feature support check for SRIOV and LAG
  ice: stop trashing VF VSI aggregator node ID information
====================

Link: https://lore.kernel.org/r/20231218192708.3397702-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents d6e5794b f5728a41

drivers/net/ethernet/intel/ice/ice_lag.c

+2 −0
Original line number Diff line number Diff line
@@ -1981,6 +1981,8 @@ int ice_init_lag(struct ice_pf *pf) 
	int n, err;



	ice_lag_init_feature_support_flag(pf);

	if (!ice_is_feature_supported(pf, ICE_F_SRIOV_LAG))

		return 0;



	pf->lag = kzalloc(sizeof(*lag), GFP_KERNEL);

	if (!pf->lag)

drivers/net/ethernet/intel/ice/ice_lib.c

+3 −4
Original line number Diff line number Diff line
@@ -2371,6 +2371,9 @@ static int ice_vsi_cfg_tc_lan(struct ice_pf *pf, struct ice_vsi *vsi) 
		} else {

			max_txqs[i] = vsi->alloc_txq;

		}



		if (vsi->type == ICE_VSI_PF)

			max_txqs[i] += vsi->num_xdp_txq;

	}



	dev_dbg(dev, "vsi->tc_cfg.ena_tc = %d\n", vsi->tc_cfg.ena_tc);
@@ -2620,10 +2623,6 @@ void ice_vsi_decfg(struct ice_vsi *vsi) 
	if (vsi->type == ICE_VSI_VF &&

	    vsi->agg_node && vsi->agg_node->valid)

		vsi->agg_node->num_vsis--;

	if (vsi->agg_node) {

		vsi->agg_node->valid = false;

		vsi->agg_node->agg_id = 0;

	}

}



/**