Changeset 22001 for branches/backfire


Ignore:
Timestamp:
2010-06-30T23:26:37+02:00 (6 years ago)
Author:
jow
Message:

[backfire] merge r21998 and r22000

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/hostapd/files/hostapd.sh

    r21354 r22001  
    77        config_get wpa_group_rekey "$vif" wpa_group_rekey 
    88        config_get_bool ap_isolate "$vif" isolate 0 
     9 
     10        config_get device "$vif" device 
     11        config_get hwmode "$device" hwmode 
    912 
    1013        if [ "$ap_isolate" -gt 0 ]; then 
     
    3942        # explicit override for crypto setting 
    4043        case "$enc" in 
    41                 *tkip+aes|*tkip+ccmp) crypto="CCMP TKIP";; 
     44                *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) crypto="CCMP TKIP";; 
    4245                *aes|*ccmp) crypto="CCMP";; 
    4346                *tkip) crypto="TKIP";; 
     47        esac 
     48 
     49        # enforce CCMP for 11ng and 11na 
     50        case "$hwmode" in 
     51                *ng|*na) crypto="CCMP";; 
    4452        esac 
    4553 
Note: See TracChangeset for help on using the changeset viewer.