From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 15 Feb 2011 08:50:45 +0000 (+0000)
Subject: [backfire] merge r25543
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=fa5bede88ef554e520f1c9e572b37831ca60151f

[backfire] merge r25543

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@25544 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index db08e7bce..98c3f61e5 100644
--- 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