From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 6 Nov 2025 17:25:16 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.19-rc1~170^2~221
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ec9871fbb80ba7db84f868f6aa40d38bc43f0e0;p=thirdparty%2Flinux.git

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

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

Conflicts:

drivers/net/wireless/ath/ath12k/mac.c
  9222582ec524 ("Revert "wifi: ath12k: Fix missing station power save configuration"")
  6917e268c433 ("wifi: ath12k: Defer vdev bring-up until CSA finalize to avoid stale beacon")
https://lore.kernel.org/11cece9f7e36c12efd732baa5718239b1bf8c950.camel@sipsolutions.net

Adjacent changes:

drivers/net/ethernet/intel/Kconfig
  b1d16f7c0063 ("libie: depend on DEBUG_FS when building LIBIE_FWLOG")
  93f53db9f9dc ("ice: switch to Page Pool")

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

1ec9871fbb80ba7db84f868f6aa40d38bc43f0e0
diff --cc drivers/net/ethernet/intel/Kconfig
index 7c6ee1e604aa6,122ee23497e6a..288fa8ce53af0
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@@ -296,10 -296,9 +296,10 @@@ config IC
  	depends on GNSS || GNSS = n
  	select AUXILIARY_BUS
  	select DIMLIB
 +	select LIBETH_XDP
  	select LIBIE
  	select LIBIE_ADMINQ
- 	select LIBIE_FWLOG
+ 	select LIBIE_FWLOG if DEBUG_FS
  	select NET_DEVLINK
  	select PACKING
  	select PLDMFW
diff --cc drivers/net/wireless/ath/ath12k/mac.c
index 0348601ecc50c,db351c9220181..9333225ceef34
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@@ -4423,7 -4209,7 +4404,8 @@@ static void ath12k_mac_bss_info_changed
  {
  	struct ath12k_vif *ahvif = arvif->ahvif;
  	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);
+ 	struct ieee80211_vif_cfg *vif_cfg = &vif->cfg;
 +	struct ath12k_link_vif *tx_arvif;
  	struct cfg80211_chan_def def;
  	u32 param_id, param_value;
  	enum nl80211_band band;