]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge tag 'ath-next-20240222' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath
authorKalle Valo <kvalo@kernel.org>
Thu, 22 Feb 2024 10:41:45 +0000 (12:41 +0200)
committerKalle Valo <kvalo@kernel.org>
Thu, 22 Feb 2024 10:41:45 +0000 (12:41 +0200)
ath.git patches for v6.9

We have support for QCA2066 now and also several new features in ath12k.

Major changes:

ath12k

* firmware-2.bin support

* support having multiple identical PCI devices (firmware needs to
  have ATH12K_FW_FEATURE_MULTI_QRTR_ID)

* QCN9274: support split-PHY devices

* WCN7850: enable Power Save Mode in station mode

* WCN7850: P2P support

ath11k:

* QCA6390 & WCN6855: support 2 concurrent station interfaces

* QCA2066 support

1  2 
drivers/net/wireless/ath/ath11k/mac.c
drivers/net/wireless/ath/ath11k/wmi.c
drivers/net/wireless/ath/ath12k/mac.c
drivers/net/wireless/ath/ath12k/wmi.c

Simple merge
Simple merge
index 18fb42c045ccb2dd48955e936ac8cd8dcd0eb12d,7d3f5321a36df7b74c212fcf3450a18eb6eaf338..52a5fb8b03e9a9715864a1ef5793d9735a28f79b
@@@ -2784,6 -2953,15 +2953,12 @@@ static void ath12k_mac_bss_info_changed
        }
  
        ath12k_mac_fils_discovery(arvif, info);
 -      if (changed & BSS_CHANGED_EHT_PUNCTURING)
 -              arvif->punct_bitmap = info->eht_puncturing;
 -
+       if (changed & BSS_CHANGED_PS &&
+           ar->ab->hw_params->supports_sta_ps) {
+               arvif->ps = vif_cfg->ps;
+               ath12k_mac_vif_setup_ps(arvif);
+       }
  }
  
  static void ath12k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
Simple merge