KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mac80211: fix calculation of VHT capability values

Browse source 
- Fix calculation of `$vht_cap` bit field
 - Replace wrong reference to `$tx_stbc` variable with proper `$tx_stbc_2by1` one
 - Emit proper `RX-STBC-{1,12,123,1234}` tokens for the VHT capability list

See https://dev.openwrt.org/ticket/22535 for reference.

Signed-off-by: Scott Shambarger <devel@shambarger.net>
This commit is contained in:
Scott Shambarger 2016-06-10 14:50:35 +02:00 committed by Jo-Philipp Wich
parent 96db69bd45
commit 4b8f0a2d26
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
View file

@ -220,7 +220,6 @@ mac80211_hostapd_setup_base() {
vht_max_a_mpdu_len_exp:7 \ vht_max_a_mpdu_len_exp:7 \
vht_max_mpdu:11454 \ vht_max_mpdu:11454 \
rx_stbc:4 \ rx_stbc:4 \
tx_stbc:4 \
vht_link_adapt:3 \ vht_link_adapt:3 \
vht160:2 vht160:2
@ -232,13 +231,13 @@ mac80211_hostapd_setup_base() {
cap_rx_stbc=$((($vht_cap >> 8) & 7)) cap_rx_stbc=$((($vht_cap >> 8) & 7))
[ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc" [ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
ht_cap_mask="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))" vht_cap="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
mac80211_add_capabilities vht_capab $vht_cap \ mac80211_add_capabilities vht_capab $vht_cap \
RXLDPC:0x10::$rxldpc \ RXLDPC:0x10::$rxldpc \
SHORT-GI-80:0x20::$short_gi_80 \ SHORT-GI-80:0x20::$short_gi_80 \
SHORT-GI-160:0x40::$short_gi_160 \ SHORT-GI-160:0x40::$short_gi_160 \
TX-STBC-2BY1:0x80::$tx_stbc \ TX-STBC-2BY1:0x80::$tx_stbc_2by1 \
SU-BEAMFORMER:0x800::$su_beamformer \ SU-BEAMFORMER:0x800::$su_beamformer \
SU-BEAMFORMEE:0x1000::$su_beamformee \ SU-BEAMFORMEE:0x1000::$su_beamformee \
MU-BEAMFORMER:0x80000::$mu_beamformer \ MU-BEAMFORMER:0x80000::$mu_beamformer \
@ -247,10 +246,10 @@ mac80211_hostapd_setup_base() {
HTC-VHT:0x400000::$htc_vht \ HTC-VHT:0x400000::$htc_vht \
RX-ANTENNA-PATTERN:0x10000000::$rx_antenna_pattern \ RX-ANTENNA-PATTERN:0x10000000::$rx_antenna_pattern \
TX-ANTENNA-PATTERN:0x20000000::$tx_antenna_pattern \ TX-ANTENNA-PATTERN:0x20000000::$tx_antenna_pattern \
RX-STBC1:0x700:0x100:1 \ RX-STBC-1:0x700:0x100:1 \
RX-STBC12:0x700:0x200:1 \ RX-STBC-12:0x700:0x200:1 \
RX-STBC123:0x700:0x300:1 \ RX-STBC-123:0x700:0x300:1 \
RX-STBC1234:0x700:0x400:1 \ RX-STBC-1234:0x700:0x400:1 \
# supported Channel widths # supported Channel widths
vht160_hw=0 vht160_hw=0