From b49acf128878f82aa75c023c79a2301ce9bd2adc Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 30 Jun 2010 21:03:56 +0000
Subject: [PATCH] [package] hostapd: allow *ccmp+tkip and *aes+tkip as well for
 cipher override

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21998 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/hostapd/files/hostapd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index a41c7678a..9edb07081 100644
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -38,7 +38,7 @@ hostapd_set_bss_options() {
 
 	# explicit override for crypto setting
 	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";;
 		*tkip) crypto="TKIP";;
 	esac