Commit 69a46a5b authored by Jakub Kicinski's avatar Jakub Kicinski
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 2025-07-15 (ixgbe, fm10k, i40e, ice)

Arnd Bergmann resolves compile issues with large NR_CPUS for ixgbe, fm10k,
and i40e.

For ice:
Dave adds a NULL check for LAG netdev.

Michal corrects a pointer check in debugfs initialization.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  ice: check correct pointer in fwlog debugfs
  ice: add NULL check in eswitch lag check
  ethernet: intel: fix building with large NR_CPUS
====================

Link: https://patch.msgid.link/20250715202948.3841437-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3cd582e7 bedd0330

drivers/net/ethernet/intel/fm10k/fm10k.h

+2 −1
Original line number Diff line number Diff line
@@ -189,13 +189,14 @@ struct fm10k_q_vector { 
	struct fm10k_ring_container rx, tx;



	struct napi_struct napi;

	struct rcu_head rcu;	/* to avoid race with update stats on free */



	cpumask_t affinity_mask;

	char name[IFNAMSIZ + 9];



#ifdef CONFIG_DEBUG_FS

	struct dentry *dbg_q_vector;

#endif /* CONFIG_DEBUG_FS */

	struct rcu_head rcu;	/* to avoid race with update stats on free */



	/* for dynamic allocation of rings associated with this q_vector */

	struct fm10k_ring ring[] ____cacheline_internodealigned_in_smp;

drivers/net/ethernet/intel/i40e/i40e.h

+1 −1
Original line number Diff line number Diff line
@@ -945,6 +945,7 @@ struct i40e_q_vector { 
	u16 reg_idx;		/* register index of the interrupt */



	struct napi_struct napi;

	struct rcu_head rcu;	/* to avoid race with update stats on free */



	struct i40e_ring_container rx;

	struct i40e_ring_container tx;
@@ -955,7 +956,6 @@ struct i40e_q_vector { 
	cpumask_t affinity_mask;

	struct irq_affinity_notify affinity_notify;



	struct rcu_head rcu;	/* to avoid race with update stats on free */

	char name[I40E_INT_NAME_STR_LEN];

	bool arm_wb_state;

	bool in_busy_poll;

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

+1 −1
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ void ice_debugfs_fwlog_init(struct ice_pf *pf) 


	pf->ice_debugfs_pf_fwlog = debugfs_create_dir("fwlog",

						      pf->ice_debugfs_pf);

	if (IS_ERR(pf->ice_debugfs_pf))

	if (IS_ERR(pf->ice_debugfs_pf_fwlog))

		goto err_create_module_files;



	fw_modules_dir = debugfs_create_dir("modules",

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

+2 −1
Original line number Diff line number Diff line
@@ -2226,7 +2226,8 @@ bool ice_lag_is_switchdev_running(struct ice_pf *pf) 
	struct ice_lag *lag = pf->lag;

	struct net_device *tmp_nd;



	if (!ice_is_feature_supported(pf, ICE_F_SRIOV_LAG) || !lag)

	if (!ice_is_feature_supported(pf, ICE_F_SRIOV_LAG) ||

	    !lag || !lag->upper_netdev)

		return false;



	rcu_read_lock();

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+2 −1
Original line number Diff line number Diff line
@@ -507,9 +507,10 @@ struct ixgbe_q_vector { 
	struct ixgbe_ring_container rx, tx;



	struct napi_struct napi;

	struct rcu_head rcu;	/* to avoid race with update stats on free */



	cpumask_t affinity_mask;

	int numa_node;

	struct rcu_head rcu;	/* to avoid race with update stats on free */

	char name[IFNAMSIZ + 9];



	/* for dynamic allocation of rings associated with this q_vector */