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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/phy/aquantia/aquantia.h
  219343755eae ("net: phy: aquantia: add missing include guards")
  61578f679378 ("net: phy: aquantia: add support for PHY LEDs")

drivers/net/ethernet/wangxun/libwx/wx_hw.c
  bd07a9817846 ("net: txgbe: remove separate irq request for MSI and INTx")
  b501d261a5b3 ("net: txgbe: add FDIR ATR support")
https://lore.kernel.org/all/20240703112936.483c1975@canb.auug.org.au/

include/linux/mlx5/mlx5_ifc.h
  048a403648fc ("net/mlx5: IFC updates for changing max EQs")
  99be56171fa9 ("net/mlx5e: SHAMPO, Re-enable HW-GRO")
https://lore.kernel.org/all/20240701133951.6926b2e3@canb.auug.org.au/

Adjacent changes:

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
  4130c67cd123 ("wifi: iwlwifi: mvm: check vif for NULL/ERR_PTR before dereference")
  3f3126515fbe ("wifi: iwlwifi: mvm: add mvm-specific guard")

include/net/mac80211.h
  816c6bec09ed ("wifi: mac80211: fix BSS_CHANGED_UNSOL_BCAST_PROBE_RESP")
  5a009b42e041 ("wifi: mac80211: track changes in AP's TPE")

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/rockchip/rk3066a.dtsi
Simple merge

diff --cc drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_ptp.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_ptp.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ethernet/wangxun/libwx/wx_hw.c
index 44cd7a5866c14ac662d8f0be97c3b98e88ce0530,d1b682ce9c6db1db2eb9318f3e6108f797d6d9db..1bf9c38e41256253ea23d7fa8a5ec194a6d8769b
--- 1/drivers/net/ethernet/wangxun/libwx/wx_hw.c
--- 2/drivers/net/ethernet/wangxun/libwx/wx_hw.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_hw.c
@@@ -1977,7 -1959,7 +1977,8 @@@ int wx_sw_init(struct wx *wx
        }
  
        bitmap_zero(wx->state, WX_STATE_NBITS);
 +      bitmap_zero(wx->flags, WX_PF_FLAGS_NBITS);
+       wx->misc_irq_domain = false;
  
        return 0;
  }

diff --cc drivers/net/ethernet/wangxun/libwx/wx_lib.c
Simple merge

diff --cc drivers/net/ethernet/wangxun/libwx/wx_type.h
Simple merge

diff --cc drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
Simple merge

diff --cc drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
Simple merge

diff --cc drivers/net/phy/aquantia/aquantia.h
index c0e1fd9d71520be2bcbbf51c64bd6a4d2164ac16,4830b25e6c7d353fde75c89a93dea7bc9c1b4f0d..0bca28ec333291cc86eac7d83e26fcae4500924c
--- 1/drivers/net/phy/aquantia/aquantia.h
--- 2/drivers/net/phy/aquantia/aquantia.h
+++ b/drivers/net/phy/aquantia/aquantia.h
@@@ -184,17 -124,4 +187,18 @@@ static inline int aqr_hwmon_probe(struc
  
  int aqr_firmware_load(struct phy_device *phydev);
  
 +int aqr_phy_led_blink_set(struct phy_device *phydev, u8 index,
 +                        unsigned long *delay_on,
 +                        unsigned long *delay_off);
 +int aqr_phy_led_brightness_set(struct phy_device *phydev,
 +                             u8 index, enum led_brightness value);
 +int aqr_phy_led_hw_is_supported(struct phy_device *phydev, u8 index,
 +                              unsigned long rules);
 +int aqr_phy_led_hw_control_get(struct phy_device *phydev, u8 index,
 +                             unsigned long *rules);
 +int aqr_phy_led_hw_control_set(struct phy_device *phydev, u8 index,
 +                             unsigned long rules);
 +int aqr_phy_led_active_low_set(struct phy_device *phydev, int index, bool enable);
 +int aqr_phy_led_polarity_set(struct phy_device *phydev, int index,
 +                           unsigned long modes);
+ #endif /* AQUANTIA_H */

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 90cf0ec69682ef8a37f460b30cf99b0d6d6b0b7d,dac6155ae1bd0d910b55001512d88b6c6c0d1122..b45a0854a2458cbaf2b4bfd1625e519eb8a5d5e2
--- 1/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
--- 2/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@@ -1698,10 -1656,12 +1698,11 @@@ static void iwl_mvm_prevent_esr_done_wk
        struct iwl_mvm_vif *mvmvif =
                container_of(wk, struct iwl_mvm_vif, prevent_esr_done_wk.work);
        struct iwl_mvm *mvm = mvmvif->mvm;
-       struct ieee80211_vif *vif = iwl_mvm_get_bss_vif(mvm);
+       struct ieee80211_vif *vif =
+               container_of((void *)mvmvif, struct ieee80211_vif, drv_priv);
  
 -      mutex_lock(&mvm->mutex);
 +      guard(mvm)(mvm);
        iwl_mvm_unblock_esr(mvm, vif, IWL_MVM_ESR_BLOCKED_PREVENTION);
 -      mutex_unlock(&mvm->mutex);
  }
  
  static void iwl_mvm_mlo_int_scan_wk(struct wiphy *wiphy, struct wiphy_work *wk)
@@@ -1720,10 -1683,12 +1721,11 @@@ static void iwl_mvm_unblock_esr_tpt(str
        struct iwl_mvm_vif *mvmvif =
                container_of(wk, struct iwl_mvm_vif, unblock_esr_tpt_wk);
        struct iwl_mvm *mvm = mvmvif->mvm;
-       struct ieee80211_vif *vif = iwl_mvm_get_bss_vif(mvm);
+       struct ieee80211_vif *vif =
+               container_of((void *)mvmvif, struct ieee80211_vif, drv_priv);
  
 -      mutex_lock(&mvm->mutex);
 +      guard(mvm)(mvm);
        iwl_mvm_unblock_esr(mvm, vif, IWL_MVM_ESR_BLOCKED_TPT);
 -      mutex_unlock(&mvm->mutex);
  }
  
  void iwl_mvm_mac_init_mvmvif(struct iwl_mvm *mvm, struct iwl_mvm_vif *mvmvif)

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/ops.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/rx.c
Simple merge

diff --cc drivers/net/wireless/microchip/wilc1000/hif.c
Simple merge

diff --cc include/linux/filter.h
Simple merge

diff --cc include/linux/mlx5/mlx5_ifc.h
index 66b921c81c0fe8b4f057d7231e9f8b53f3c90bb4,d45bfb7cf81d0fc92536fcc540bf35234658efb4..fdad0071d599e9ffb1962cd520830b9922824e20
--- 1/include/linux/mlx5/mlx5_ifc.h
--- 2/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@@ -2032,11 -2029,11 +2032,15 @@@ struct mlx5_ifc_cmd_hca_cap_2_bits 
        u8         pcc_ifa2[0x1];
        u8         reserved_at_3f1[0xf];
  
 -      u8         reserved_at_400[0x40];
 +      u8         reserved_at_400[0x1];
 +      u8         min_mkey_log_entity_size_fixed_buffer_valid[0x1];
 +      u8         reserved_at_402[0x1e];
 +
-       u8         reserved_at_420[0x3e0];
++      u8         reserved_at_420[0x20];
+ 
+       u8         reserved_at_440[0x8];
+       u8         max_num_eqs_24b[0x18];
+       u8         reserved_at_460[0x3a0];
  };
  
  enum mlx5_ifc_flow_destination_type {

diff --cc include/linux/phy.h
Simple merge

diff --cc include/net/mac80211.h
index 9c96e8ae9ef760f481b8a046564c192abff3a5cc,45ad37adbe328722a885ef761a69ca26eedb9ce9..5f36b3d979ddc27b47b324fc8e1251b67b913f6b
--- 1/include/net/mac80211.h
--- 2/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@@ -396,10 -395,9 +396,10 @@@ enum ieee80211_bss_change 
        BSS_CHANGED_HE_OBSS_PD          = 1<<28,
        BSS_CHANGED_HE_BSS_COLOR        = 1<<29,
        BSS_CHANGED_FILS_DISCOVERY      = 1<<30,
-       BSS_CHANGED_UNSOL_BCAST_PROBE_RESP = 1<<31,
+       BSS_CHANGED_UNSOL_BCAST_PROBE_RESP = BIT_ULL(31),
        BSS_CHANGED_MLD_VALID_LINKS     = BIT_ULL(33),
        BSS_CHANGED_MLD_TTLM            = BIT_ULL(34),
 +      BSS_CHANGED_TPE                 = BIT_ULL(35),
  
        /* when adding here, make sure to change ieee80211_reconfig */
  };

diff --cc io_uring/net.c
Simple merge

diff --cc net/core/datagram.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/unix/garbage.c
Simple merge