From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 21 May 2026 22:02:54 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a20b34fe3b31b292078bc79ec18a2ab0d9f7719;p=thirdparty%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-7.1-rc5).

No conflicts, adjacent changes:

drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
  cc199cd1b912 ("net/mlx5e: Reduce branches in napi poll")
  c326f9c68921 ("net/mlx5e: xsk: Fix unlocked writing to ICOSQ")

drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
  c6df9a65cbb0 ("net/mlx5: Skip disabled vports when setting max TX speed")
  1fba57c91416 ("net/mlx5: Add VHCA_ID page management mode support")

net/mac80211/mlme.c
  a6e6ccd5bd07 ("wifi: mac80211: consume only present negotiated TTLM maps")
  49e62ec6eb06 ("wifi: mac80211: move frame RX handling to type files")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

6a20b34fe3b31b292078bc79ec18a2ab0d9f7719
diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
index 143890af516a6,e90c6c6df835d..1851056064698
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
@@@ -248,12 -247,12 +248,12 @@@ int mlx5e_napi_poll(struct napi_struct 
  			mlx5e_cq_arm(&xsksq->cq);
  			mlx5e_cq_arm(&xskrq->cq);
  		}
 +		if (c->xdpsq)
 +			mlx5e_cq_arm(&c->xdpsq->cq);
  	}
 -	if (c->xdpsq)
 -		mlx5e_cq_arm(&c->xdpsq->cq);
  
  	if (unlikely(aff_change && busy_xsk)) {
- 		mlx5e_trigger_irq(&c->icosq);
+ 		mlx5e_trigger_napi_async_icosq(c);
  		ch_stats->force_irq++;
  	}