[Madwifi-cvs] revision 4136 committed
Status: Beta
Brought to you by:
otaku
From: Pavel R. <svn...@ma...> - 2011-02-02 21:22:46
|
Project : madwifi Revision : 4136 Author : proski (Pavel Roskin) Date : 2011-02-02 22:22:31 +0100 (Wed, 02 Feb 2011) Log Message : Add support for the latest kernels that don't define AUTOCONF_INCLUDED Use CONFIG_LOCALVERSION as an alternative to check that the configuration settings have been included. Affected Files: * madwifi/branches/madwifi-0.9.4/ath/if_ath.c updated * madwifi/branches/madwifi-0.9.4/ath/if_ath_ahb.c updated * madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c updated * madwifi/branches/madwifi-0.9.4/ath_hal/ah_os.c updated * madwifi/branches/madwifi-0.9.4/ath_rate/amrr/amrr.c updated * madwifi/branches/madwifi-0.9.4/ath_rate/minstrel/minstrel.c updated * madwifi/branches/madwifi-0.9.4/ath_rate/onoe/onoe.c updated * madwifi/branches/madwifi-0.9.4/ath_rate/sample/sample.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_acl.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_beacon.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_ccmp.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_none.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_tkip.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_wep.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_input.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_monitor.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_node.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_output.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_power.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_proto.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_rate.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_scan.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_scan_ap.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_scan_sta.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_xauth.c updated * madwifi/branches/madwifi-0.9.4/net80211/if_media.c updated * madwifi/branches/madwifi-0.9.4/regression/ccmp/test_ccmp.c updated * madwifi/branches/madwifi-0.9.4/regression/tkip/test_tkip.c updated * madwifi/branches/madwifi-0.9.4/regression/wep/test_wep.c updated Modified: madwifi/branches/madwifi-0.9.4/ath/if_ath.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath/if_ath.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/ath/if_ath.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -44,7 +44,7 @@ */ #include "opt_ah.h" -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/ath/if_ath_ahb.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath/if_ath_ahb.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/ath/if_ath_ahb.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -10,7 +10,7 @@ #define EXPORT_SYMTAB #endif -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -42,7 +42,7 @@ #define EXPORT_SYMTAB #endif -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/ath_hal/ah_os.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath_hal/ah_os.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/ath_hal/ah_os.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -44,7 +44,7 @@ /* Don't use virtualized timer in Linux 2.6.20+ */ #define USE_REAL_TIME_DELAY -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/ath_rate/amrr/amrr.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath_rate/amrr/amrr.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/ath_rate/amrr/amrr.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -43,7 +43,7 @@ * "IEEE 802.11 Rate Adaptation: A Practical Approach" by * Mathieu Lacage, Hossein Manshaei, Thierry Turletti */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/ath_rate/minstrel/minstrel.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath_rate/minstrel/minstrel.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/ath_rate/minstrel/minstrel.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -87,7 +87,7 @@ * Also, this implementation tracks the average transmission time for * a few different packet sizes independently for each link. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif Modified: madwifi/branches/madwifi-0.9.4/ath_rate/onoe/onoe.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath_rate/onoe/onoe.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/ath_rate/onoe/onoe.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -39,7 +39,7 @@ /* * Atsushi Onoe's rate control algorithm. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/ath_rate/sample/sample.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath_rate/sample/sample.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/ath_rate/sample/sample.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -41,7 +41,7 @@ * John Bicket's SampleRate control algorithm. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -38,7 +38,7 @@ /* * IEEE 802.11 generic handler */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_acl.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_acl.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_acl.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -45,7 +45,7 @@ * and if found the frame is either accepted (ACL_POLICY_ALLOW) * or rejected (ACL_POLICY_DENT). */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_beacon.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_beacon.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_beacon.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -38,7 +38,7 @@ /* * IEEE 802.11 beacon handling routines */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -38,7 +38,7 @@ /* * IEEE 802.11 generic crypto support. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_ccmp.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_ccmp.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_ccmp.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -38,7 +38,7 @@ * AP driver. The code is used with the consent of the author and * it's license is included below. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_none.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_none.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_none.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -34,7 +34,7 @@ /* * IEEE 802.11 NULL crypto support. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_tkip.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_tkip.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_tkip.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -38,7 +38,7 @@ * AP driver. The code is used with the consent of the author and * it's license is included below. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_wep.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_wep.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_crypto_wep.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -34,7 +34,7 @@ /* * IEEE 802.11 WEP crypto support. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_input.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_input.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_input.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -38,7 +38,7 @@ /* * IEEE 802.11 input handling. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -33,7 +33,7 @@ /* * IEEE 802.11 support (Linux-specific code) */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_monitor.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_monitor.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_monitor.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -34,7 +34,7 @@ /* * IEEE 802.11 monitor mode */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_node.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_node.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_node.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -38,7 +38,7 @@ /* * IEEE 802.11 node handling support. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_output.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_output.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_output.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -38,7 +38,7 @@ /* * IEEE 802.11 output handling. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_power.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_power.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_power.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -38,7 +38,7 @@ /* * IEEE 802.11 power save support. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_proto.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_proto.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_proto.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -38,7 +38,7 @@ /* * IEEE 802.11 protocol support. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_rate.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_rate.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_rate.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -34,7 +34,7 @@ /* * Atheros module glue for rate control algorithms. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_scan.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_scan.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_scan.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -37,7 +37,7 @@ /* * IEEE 802.11 scanning support. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_scan_ap.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_scan_ap.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_scan_ap.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -37,7 +37,7 @@ /* * IEEE 802.11 ap scanning support. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_scan_sta.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_scan_sta.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_scan_sta.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -37,7 +37,7 @@ /* * IEEE 802.11 station scanning support. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -39,7 +39,7 @@ /* * Wireless extensions support for 802.11 common code. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_xauth.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_xauth.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_xauth.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -46,7 +46,7 @@ * of the available callbacks--the user mode authenticator process works * entirely from messages about stations joining and leaving. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/net80211/if_media.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/if_media.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/net80211/if_media.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -49,7 +49,7 @@ #define EXPORT_SYMTAB #endif -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/regression/ccmp/test_ccmp.c =================================================================== --- madwifi/branches/madwifi-0.9.4/regression/ccmp/test_ccmp.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/regression/ccmp/test_ccmp.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -44,7 +44,7 @@ * you want; e.g. insmod ccmp_test tests=7 will run only test MPDUs * 1, 2, and 3. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/regression/tkip/test_tkip.c =================================================================== --- madwifi/branches/madwifi-0.9.4/regression/tkip/test_tkip.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/regression/tkip/test_tkip.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -34,7 +34,7 @@ /* * TKIP test module. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> Modified: madwifi/branches/madwifi-0.9.4/regression/wep/test_wep.c =================================================================== --- madwifi/branches/madwifi-0.9.4/regression/wep/test_wep.c 2011-02-02 21:17:59 UTC (rev 4135) +++ madwifi/branches/madwifi-0.9.4/regression/wep/test_wep.c 2011-02-02 21:22:31 UTC (rev 4136) @@ -44,7 +44,7 @@ * you want; e.g. insmod wep_test tests=7 will run only test MPDUs * 1, 2, and 3. */ -#ifndef AUTOCONF_INCLUDED +#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION) #include <linux/config.h> #endif #include <linux/version.h> |