]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: iwlwifi: mld: Fix number of antennas in NAN capabilities
authorIlan Peer <ilan.peer@intel.com>
Sun, 10 May 2026 20:48:36 +0000 (23:48 +0300)
committerMiri Korenblit <miriam.rachel.korenblit@intel.com>
Tue, 26 May 2026 12:17:09 +0000 (15:17 +0300)
Instead of hardcoding the number of supported antennas for Tx/Rx, set
them according to hardware capabilities.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Link: https://patch.msgid.link/20260510234534.26f8653d44a3.Ib8b9769e7a598b01f6285bd0782aa3bf13f144a2@changeid
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
drivers/net/wireless/intel/iwlwifi/mld/mac80211.c

index e76421a8a8e6a775e811e8de06930d25eabc4b34..4ad1d55fd6463e4cf454255e5500efb6bbe0b461 100644 (file)
@@ -290,8 +290,12 @@ static void iwl_mld_hw_set_nan(struct iwl_mld *mld)
                                      NAN_OP_MODE_PHY_MODE_HE |
                                      NAN_OP_MODE_160MHZ;
 
-       /* Support 2 antennas for Tx and Rx */
-       hw->wiphy->nan_capa.n_antennas = 0x22;
+       hw->wiphy->nan_capa.n_antennas =
+               (hweight32(hw->wiphy->available_antennas_tx) &
+                NAN_DEV_CAPA_NUM_TX_ANT_MASK) |
+               ((hweight32(hw->wiphy->available_antennas_rx) <<
+                 NAN_DEV_CAPA_NUM_RX_ANT_POS) &
+                NAN_DEV_CAPA_NUM_RX_ANT_MASK);
 
        /* Maximal channel switch time is 4 msec */
        hw->wiphy->nan_capa.max_channel_switch_time = 4;