Merge tag 'wireless-next-2024-09-04' of git://git.kernel.org/pub/scm/linux/kernel...

Kalle Valo says:

====================
pull-request: wireless-next-2024-09-04

here's a pull request to net-next tree, more info below. Please let me know if
there are any problems.
====================

Conflicts:

drivers/net/wireless/ath/ath12k/hw.c
  38055789d151 ("wifi: ath12k: use 128 bytes aligned iova in transmit path for WCN7850")
  8be12629b428 ("wifi: ath12k: restore ASPM for supported hardwares only")
https://lore.kernel.org/87msldyj97.fsf@kernel.org

Link: https://patch.msgid.link/20240904153205.64C11C4CEC2@smtp.kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc drivers/net/wireless/ath/ath12k/hw.c
index 7b0b6a7f4701ab31ebbc5c429f9d1a7de4baaa1a,76c0e07a88de79bafa43979ca589601ba9cdc497..ec1bda95e555ddea49febc312a1a0b935973b032
--- 1/drivers/net/wireless/ath/ath12k/hw.c
--- 2/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@@ -925,7 -925,7 +925,9 @@@ static const struct ath12k_hw_params at
                .acpi_guid = NULL,
                .supports_dynamic_smps_6ghz = true,
  
 +              .iova_mask = 0,
++
+               .supports_aspm = false,
        },
        {
                .name = "wcn7850 hw2.0",
@@@ -1003,7 -1003,7 +1005,9 @@@
                .acpi_guid = &wcn7850_uuid,
                .supports_dynamic_smps_6ghz = false,
  
 +              .iova_mask = ATH12K_PCIE_MAX_PAYLOAD_SIZE - 1,
++
+               .supports_aspm = true,
        },
        {
                .name = "qcn9274 hw2.0",
@@@ -1077,7 -1077,7 +1081,9 @@@
                .acpi_guid = NULL,
                .supports_dynamic_smps_6ghz = true,
  
 +              .iova_mask = 0,
++
+               .supports_aspm = false,
        },
  };
  

diff --cc drivers/net/wireless/ath/ath12k/hw.h
Simple merge

diff --cc drivers/net/wireless/ath/ath12k/mac.c
Simple merge

diff --cc drivers/net/wireless/ath/ath12k/pci.c
Simple merge

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/fw/acpi.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-trans.h
Simple merge

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

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

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 1cc9c426bb1599eeaf830ca0c34987720c9e366d,296d8c5622074164b1193e3abf9b691f7b113d92..3ce9150213a74452e32082aeb2019942384ae9f8
--- 1/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
--- 2/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@@ -1656,20 -1656,9 +1656,20 @@@ iwl_mvm_umac_scan_cfg_channels_v7(struc
                u8 iwl_band = iwl_mvm_phy_band_from_nl80211(band);
  
                cfg->flags = cpu_to_le32(flags | n_aps_flag);
-               cfg->v2.channel_num = channels[i]->hw_value;
+               cfg->channel_num = channels[i]->hw_value;
                if (cfg80211_channel_is_psc(channels[i]))
                        cfg->flags = 0;
 +
 +              if (band == NL80211_BAND_6GHZ) {
 +                      /* 6 GHz channels should only appear in a scan request
 +                       * that has scan_6ghz set. The only exception is MLO
 +                       * scan, which has to be passive.
 +                       */
 +                      WARN_ON_ONCE(cfg->flags != 0);
 +                      cfg->flags =
 +                              cpu_to_le32(IWL_UHB_CHAN_CFG_FLAG_FORCE_PASSIVE);
 +              }
 +
                cfg->v2.iter_count = 1;
                cfg->v2.iter_interval = 0;
                if (version < 17)

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/drv.c
Simple merge

diff --cc drivers/net/wireless/marvell/mwifiex/cfg80211.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

diff --cc net/mac80211/util.c
Simple merge