From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 7 Nov 2011 05:38:09 +0000 (+0000)
Subject: libiwinfo: properly detect wep and unencrypted wifi iface state on madwifi
X-Git-Tag: 0.11.0~1394
X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=b93fe699073f9c51ae555235b0d37f056d048528

libiwinfo: properly detect wep and unencrypted wifi iface state on madwifi
---

diff --git a/contrib/package/iwinfo/src/iwinfo_madwifi.c b/contrib/package/iwinfo/src/iwinfo_madwifi.c
index 54a77cd4dc..be89978999 100644
--- a/contrib/package/iwinfo/src/iwinfo_madwifi.c
+++ b/contrib/package/iwinfo/src/iwinfo_madwifi.c
@@ -641,6 +641,9 @@ int madwifi_get_encryption(const char *ifname, char *buf)
 					c->pair_ciphers |= IWINFO_CIPHER_WEP40;
 					break;
 
+				case 0:
+					break;
+
 				default:
 					c->pair_ciphers = IWINFO_CIPHER_WEP40 |
 						IWINFO_CIPHER_WEP104;
@@ -699,7 +702,7 @@ int madwifi_get_encryption(const char *ifname, char *buf)
 		}
 	}
 
-	c->enabled = (c->wpa_version || c->auth_algs) ? 1 : 0;
+	c->enabled = (c->wpa_version || (c->auth_algs && c->pair_ciphers)) ? 1 : 0;
 
 	return 0;
 }