diff options
| author | Scott Shambarger <devel@shambarger.net> | 2016-06-10 14:50:35 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2016-06-10 18:08:30 +0200 |
| commit | 4b8f0a2d26e5477b2dc4542ec7438665a906b756 (patch) | |
| tree | d9c5e8d61e21878f0a6d92017babe0ffd253f278 | |
| parent | 96db69bd45e459def044645ad759245581a6a5b2 (diff) | |
| download | upstream-4b8f0a2d26e5477b2dc4542ec7438665a906b756.tar.gz upstream-4b8f0a2d26e5477b2dc4542ec7438665a906b756.tar.bz2 upstream-4b8f0a2d26e5477b2dc4542ec7438665a906b756.zip | |
mac80211: fix calculation of VHT capability values
- 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>
| -rw-r--r-- | package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index 02c195e1fa..e3d612e4b2 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -220,7 +220,6 @@ mac80211_hostapd_setup_base() { vht_max_a_mpdu_len_exp:7 \ vht_max_mpdu:11454 \ rx_stbc:4 \ - tx_stbc:4 \ vht_link_adapt:3 \ vht160:2 @@ -232,13 +231,13 @@ mac80211_hostapd_setup_base() { cap_rx_stbc=$((($vht_cap >> 8) & 7)) [ "$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 \ RXLDPC:0x10::$rxldpc \ SHORT-GI-80:0x20::$short_gi_80 \ 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-BEAMFORMEE:0x1000::$su_beamformee \ MU-BEAMFORMER:0x80000::$mu_beamformer \ @@ -247,10 +246,10 @@ mac80211_hostapd_setup_base() { HTC-VHT:0x400000::$htc_vht \ RX-ANTENNA-PATTERN:0x10000000::$rx_antenna_pattern \ TX-ANTENNA-PATTERN:0x20000000::$tx_antenna_pattern \ - RX-STBC1:0x700:0x100:1 \ - RX-STBC12:0x700:0x200:1 \ - RX-STBC123:0x700:0x300:1 \ - RX-STBC1234:0x700:0x400:1 \ + RX-STBC-1:0x700:0x100:1 \ + RX-STBC-12:0x700:0x200:1 \ + RX-STBC-123:0x700:0x300:1 \ + RX-STBC-1234:0x700:0x400:1 \ # supported Channel widths vht160_hw=0 |