ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-25 08:21:14 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

mac80211: add preliminary support for enabling 802.11ax in config

Browse Source 
No advanced features are configurable yet, just basic enabling of HE modes

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2020-08-26 12:30:12 +02:00
parent a38b6efbc1
commit acf1733496
1 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
View File

@ -121,8 +121,8 @@ mac80211_hostapd_setup_base() {
ieee80211n=1 ieee80211n=1
ht_capab= ht_capab=
case "$htmode" in case "$htmode" in
VHT20|HT20) ;; VHT20|HT20|HE20) ;;
HT40*|VHT40|VHT80|VHT160) HT40*|VHT40|VHT80|VHT160|HE40|HE80|HE160)
case "$hwmode" in case "$hwmode" in
a) a)
case "$(( ($channel / 4) % 2 ))" in case "$(( ($channel / 4) % 2 ))" in
@ -192,19 +192,21 @@ mac80211_hostapd_setup_base() {
# 802.11ac # 802.11ac
enable_ac=0 enable_ac=0
vht_oper_chwidth=0
vht_center_seg0=
idx="$channel" idx="$channel"
case "$htmode" in case "$htmode" in
VHT20) enable_ac=1;; VHT20|HE20) enable_ac=1;;
VHT40) VHT40|HE40)
case "$(( ($channel / 4) % 2 ))" in case "$(( ($channel / 4) % 2 ))" in
1) idx=$(($channel + 2));; 1) idx=$(($channel + 2));;
0) idx=$(($channel - 2));; 0) idx=$(($channel - 2));;
esac esac
enable_ac=1 enable_ac=1
append base_cfg "vht_oper_chwidth=0" "$N" vht_center_seg0=$idx
append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N"
;; ;;
VHT80) VHT80|HE80)
case "$(( ($channel / 4) % 4 ))" in case "$(( ($channel / 4) % 4 ))" in
1) idx=$(($channel + 6));; 1) idx=$(($channel + 6));;
2) idx=$(($channel + 2));; 2) idx=$(($channel + 2));;
@ -212,19 +214,20 @@ mac80211_hostapd_setup_base() {
0) idx=$(($channel - 6));; 0) idx=$(($channel - 6));;
esac esac
enable_ac=1 enable_ac=1
append base_cfg "vht_oper_chwidth=1" "$N" vht_oper_chwidth=1
append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N" vht_center_seg0=$idx
;; ;;
VHT160) VHT160|HE160)
case "$channel" in case "$channel" in
36|40|44|48|52|56|60|64) idx=50;; 36|40|44|48|52|56|60|64) idx=50;;
100|104|108|112|116|120|124|128) idx=114;; 100|104|108|112|116|120|124|128) idx=114;;
esac esac
enable_ac=1 enable_ac=1
append base_cfg "vht_oper_chwidth=2" "$N" vht_oper_chwidth=2
append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N" vht_center_seg0=$idx
;; ;;
esac esac
[ "$hwmode" = "a" ] || enable_ac=0
if [ "$enable_ac" != "0" ]; then if [ "$enable_ac" != "0" ]; then
json_get_vars \ json_get_vars \
@ -253,6 +256,9 @@ mac80211_hostapd_setup_base() {
vht_cap="$(($vht_cap | $cap))" vht_cap="$(($vht_cap | $cap))"
done done
append base_cfg "vht_oper_chwidth=$vht_oper_chwidth" "$N"
append base_cfg "vht_oper_centr_freq_seg0_idx=$vht_center_seg0" "$N"
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"
vht_cap="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))" vht_cap="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
@ -323,6 +329,25 @@ mac80211_hostapd_setup_base() {
[ -n "$vht_capab" ] && append base_cfg "vht_capab=$vht_capab" "$N" [ -n "$vht_capab" ] && append base_cfg "vht_capab=$vht_capab" "$N"
fi fi
# 802.11ax
enable_ax=0
case "$htmode" in
HE*) enable_ax=1 ;;
esac
if [ "$enable_ax" != "0" ]; then
append base_cfg "ieee80211ax=1" "$N"
[ "$hwmode" = "a" ] && {
append base_cfg "he_oper_chwidth=$vht_oper_chwidth" "$N"
append base_cfg "he_oper_centr_freq_seg0_idx=$vht_center_seg0" "$N"
}
append base_cfg "he_default_pe_duration=4" "$N"
append base_cfg "he_rts_threshold=1023" "$N"
append base_cfg "he_su_beamformer=1" "$N"
append base_cfg "he_su_beamformee=1" "$N"
append base_cfg "he_mu_beamformer=1023" "$N"
fi
hostapd_prepare_device_config "$hostapd_conf_file" nl80211 hostapd_prepare_device_config "$hostapd_conf_file" nl80211
cat >> "$hostapd_conf_file" <<EOF cat >> "$hostapd_conf_file" <<EOF
${channel:+channel=$channel} ${channel:+channel=$channel}