mac80211: set beamformer/beamformee number of antennas in VHT caps
authorFelix Fietkau <nbd@nbd.name>
Mon, 22 Nov 2021 12:04:03 +0000 (13:04 +0100)
committerFelix Fietkau <nbd@nbd.name>
Mon, 22 Nov 2021 12:04:34 +0000 (13:04 +0100)
Without this, beamforming is probably not working

Signed-off-by: Felix Fietkau <nbd@nbd.name>
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh

index a958773b45f080bcd2a7ab7d020b27b9b4826bba..27eecf3a7f979f33c419bac6f112bd3fe11cbb81 100644 (file)
@@ -52,6 +52,8 @@ drv_mac80211_init_device_config() {
                he_spr_sr_control \
                he_twt_required
        config_add_int \
+               beamformer_antennas \
+               beamformee_antennas \
                vht_max_a_mpdu_len_exp \
                vht_max_mpdu \
                vht_link_adapt \
@@ -293,6 +295,8 @@ mac80211_hostapd_setup_base() {
                        mu_beamformee:1 \
                        vht_txop_ps:1 \
                        htc_vht:1 \
+                       beamformee_antennas:4 \
+                       beamformer_antennas:4 \
                        rx_antenna_pattern:1 \
                        tx_antenna_pattern:1 \
                        vht_max_a_mpdu_len_exp:7 \
@@ -333,6 +337,18 @@ mac80211_hostapd_setup_base() {
                        RX-STBC-123:0x700:0x300:1 \
                        RX-STBC-1234:0x700:0x400:1 \
 
+               [ "$(($vht_cap & 0x800))" -gt 0 -a "$su_beamformer" -gt 0 ] && {
+                       cap_ant="$(( ( ($vht_cap >> 16) & 3 ) + 1 ))"
+                       [ "$cap_ant" -gt "$beamformer_antennas" ] && cap_ant="$beamformer_antennas"
+                       [ "$cap_ant" -gt 1 ] && vht_capab="$vht_capab[SOUNDING-DIMENSION-$cap_ant]"
+               }
+
+               [ "$(($vht_cap & 0x1000))" -gt 0 -a "$su_beamformee" -gt 0 ] && {
+                       cap_ant="$(( ( ($vht_cap >> 13) & 3 ) + 1 ))"
+                       [ "$cap_ant" -gt "$beamformee_antennas" ] && cap_ant="$beamformee_antennas"
+                       [ "$cap_ant" -gt 1 ] && vht_capab="$vht_capab[BF-ANTENNA-$cap_ant]"
+               }
+
                # supported Channel widths
                vht160_hw=0
                [ "$(($vht_cap & 12))" -eq 4 -a 1 -le "$vht160" ] && \