[Madwifi-cvs] revision 1717 committed

[Pavel R. <svn...@ma...>]

Project     : madwifi
Revision    : 1717
Author      : proski (Pavel Roskin)
Date        : 2006-09-18 23:04:54 +0200 (Mon, 18 Sep 2006)

Log Message :
Fix use of mixed code and declarations

r1508 broke compilation for the systems with wireless extensions 14 and
newer, but without IWEVGENIE defined.  Reported by
Nazeer Khan <Naz...@ni...>

Affected Files:
* trunk/net80211/ieee80211_wireless.c                 updated             


Modified: trunk/net80211/ieee80211_wireless.c
===================================================================
--- trunk/net80211/ieee80211_wireless.c	2006-09-16 14:40:40 UTC (rev 1716)
+++ trunk/net80211/ieee80211_wireless.c	2006-09-18 21:04:54 UTC (rev 1717)
@@ -1589,7 +1589,11 @@
 	char *last_ev;
 #if WIRELESS_EXT > 14
 	char buf[64 * 2 + 30];
+#ifndef IWEVGENIE
+	static const char rsn_leader[] = "rsn_ie=";
+	static const char wpa_leader[] = "wpa_ie=";
 #endif
+#endif
 	struct iw_event iwe;
 	char *current_val;
 	int j;
@@ -1736,7 +1740,6 @@
 		iwe.cmd = IWEVGENIE;
 		iwe.u.data.length = se->se_rsn_ie[1] + 2;
 #else	
-		static const char rsn_leader[] = "rsn_ie=";
 		memset(&iwe, 0, sizeof(iwe));
 		iwe.cmd = IWEVCUSTOM;
 		if (se->se_rsn_ie[0] == IEEE80211_ELEMID_RSN)
@@ -1762,7 +1765,6 @@
 		iwe.cmd = IWEVGENIE;
 		iwe.u.data.length = se->se_wpa_ie[1] + 2;
 #else
-		static const char wpa_leader[] = "wpa_ie=";
 		memset(&iwe, 0, sizeof(iwe));
 		iwe.cmd = IWEVCUSTOM;
 		iwe.u.data.length = encode_ie(buf, sizeof(buf),