qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 00:39:23 +02:00
Code

[backfire] merge r21998 and r22000

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22001 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-06-30 21:26:37 +00:00
parent d11ba9cede
commit 5e2a0339ce
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/hostapd/files/hostapd.sh
View File

@ -7,6 +7,9 @@ hostapd_set_bss_options() {
config_get wpa_group_rekey "$vif" wpa_group_rekey config_get wpa_group_rekey "$vif" wpa_group_rekey
config_get_bool ap_isolate "$vif" isolate 0 config_get_bool ap_isolate "$vif" isolate 0
config_get device "$vif" device
config_get hwmode "$device" hwmode
if [ "$ap_isolate" -gt 0 ]; then if [ "$ap_isolate" -gt 0 ]; then
append "$var" "ap_isolate=$ap_isolate" "$N" append "$var" "ap_isolate=$ap_isolate" "$N"
fi fi
@ -38,11 +41,16 @@ hostapd_set_bss_options() {
# explicit override for crypto setting # explicit override for crypto setting
case "$enc" in case "$enc" in
*tkip+aes|*tkip+ccmp) crypto="CCMP TKIP";; *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) crypto="CCMP TKIP";;
*aes|*ccmp) crypto="CCMP";; *aes|*ccmp) crypto="CCMP";;
*tkip) crypto="TKIP";; *tkip) crypto="TKIP";;
esac esac
# enforce CCMP for 11ng and 11na
case "$hwmode" in
*ng|*na) crypto="CCMP";;
esac
# use crypto/auth settings for building the hostapd config # use crypto/auth settings for building the hostapd config
case "$enc" in case "$enc" in
*psk*) *psk*)