183130227/tn3399_openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac80211: simplify HT40 handling, derive lower/upper channel mode automatically from channel index

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 40680
This commit is contained in:
Felix Fietkau 2014-05-03 18:38:09 +00:00
parent 0c2f0c6a3b
commit 24791e0dd8
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,11 +71,10 @@ mac80211_hostapd_setup_base() {
ht_capab= ht_capab=
case "$htmode" in case "$htmode" in
HT20|HT40-|HT40+) ht_capab="[$htmode]";; HT40*|VHT40|VHT80|VHT160)
VHT40|VHT80|VHT160) case "$(( ($channel / 4) % 2 ))" in
case "$channel" in 1) ht_capab="[HT40+]";;
36|44|52|60|100|108|116|124|132|140|149|157) ht_capab="[HT40+]";; 0) ht_capab="[HT40-]";;
40|48|56|64|104|112|120|128|136|144|153|161) ht_capab="[HT40-]";;
esac esac
;; ;;
esac esac
@ -90,32 +89,20 @@ mac80211_hostapd_setup_base() {
idx="$channel" idx="$channel"
case "$htmode" in case "$htmode" in
VHT40) VHT40)
case "$channel" in case "$(( ($channel / 4) % 2 ))" in
36|40) idx=38;; 1) idx=$(($channel + 2));;
44|48) idx=42;; 0) idx=$(($channel - 2));;
52|56) idx=54;;
60|64) idx=58;;
100|104) idx=102;;
108|112) idx=110;;
116|120) idx=118;;
124|128) idx=126;;
132|136) idx=134;;
140|144) idx=142;;
149|153) idx=151;;
157|161) idx=159;;
esac esac
enable_ac=1 enable_ac=1
append base_cfg "vht_oper_chwidth=0" "$N" append base_cfg "vht_oper_chwidth=0" "$N"
append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N" append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N"
;; ;;
VHT80) VHT80)
case "$channel" in case "$(( ($channel / 4) % 2 ))" in
36|40|44|48) idx=42;; 1) idx=$(($channel + 6));;
52|56|60|64) idx=58;; 2) idx=$(($channel + 2));;
100|104|108|112) idx=106;; 3) idx=$(($channel - 2));;
116|120|124|128) idx=122;; 0) idx=$(($channel - 6));;
132|136|140|144) idx=138;;
149|153|157|161) idx=155;;
esac esac
enable_ac=1 enable_ac=1
append base_cfg "vht_oper_chwidth=1" "$N" append base_cfg "vht_oper_chwidth=1" "$N"