merge r25543

SVN-Revision: 25544

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index db08e7bce2b131a9a044128985177166043853b0..98c3f61e5889e212248e4ce7e0d6671cee5e3e69 100644 (file)
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -47,8 +47,8 @@ hostapd_set_bss_options() {
        esac
 
        # enforce CCMP for 11ng and 11na
-       case "$hwmode" in
-               *ng|*na) crypto="CCMP";;
+       case "$hwmode:$crypto" in
+               *ng:TKIP|*na:TKIP) crypto="CCMP TKIP";;
        esac
 
        # use crypto/auth settings for building the hostapd config