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. git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4134 0192ed92-7a03-0410-a25b-9323aeb14dbd
puzzlet · Feb 2, 2011 · e408c07 · e408c07
1 parent 7da3379
commit e408c07
Show file tree

Hide file tree

Showing 35 changed files with 36 additions and 36 deletions.
diff --git a/ath/if_ath.c b/ath/if_ath.c
@@ -45,7 +45,7 @@
 #include "if_ath_debug.h"
 #include "opt_ah.h"
 
-#ifndef AUTOCONF_INCLUDED
+#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION)
 #include <linux/config.h>
 #endif
 #include <linux/version.h>

diff --git a/ath/if_ath_ahb.c b/ath/if_ath_ahb.c
@@ -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>

diff --git a/ath/if_ath_pci.c b/ath/if_ath_pci.c
@@ -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>

diff --git a/ath/if_ath_radar.c b/ath/if_ath_radar.c
@@ -22,7 +22,7 @@
 
 #include "if_ath_debug.h"
 
-#ifndef AUTOCONF_INCLUDED
+#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION)
 #include <linux/config.h>
 #endif
 #include <linux/version.h>

diff --git a/ath_hal/ah_os.c b/ath_hal/ah_os.c
@@ -44,9 +44,9 @@
 /* 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 /* AUTOCONF_INCLUDED */
+#endif
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>

diff --git a/ath_rate/amrr/amrr.c b/ath_rate/amrr/amrr.c
@@ -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>

diff --git a/ath_rate/minstrel/minstrel.c b/ath_rate/minstrel/minstrel.c
@@ -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
 

diff --git a/ath_rate/onoe/onoe.c b/ath_rate/onoe/onoe.c
@@ -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>

diff --git a/ath_rate/sample/sample.c b/ath_rate/sample/sample.c
@@ -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>

diff --git a/net80211/ieee80211.c b/net80211/ieee80211.c
@@ -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>

diff --git a/net80211/ieee80211_acl.c b/net80211/ieee80211_acl.c
@@ -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>

diff --git a/net80211/ieee80211_beacon.c b/net80211/ieee80211_beacon.c
@@ -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>

diff --git a/net80211/ieee80211_crypto.c b/net80211/ieee80211_crypto.c
@@ -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>

diff --git a/net80211/ieee80211_crypto_ccmp.c b/net80211/ieee80211_crypto_ccmp.c
@@ -38,7 +38,7 @@
  * AP driver. The code is used with the consent of the author and
  * its license is included below.
  */
-#ifndef AUTOCONF_INCLUDED
+#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION)
 #include <linux/config.h>
 #endif
 #include <linux/version.h>

diff --git a/net80211/ieee80211_crypto_none.c b/net80211/ieee80211_crypto_none.c
@@ -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>

diff --git a/net80211/ieee80211_crypto_tkip.c b/net80211/ieee80211_crypto_tkip.c
@@ -38,7 +38,7 @@
  * AP driver. The code is used with the consent of the author and
  * its license is included below.
  */
-#ifndef AUTOCONF_INCLUDED
+#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION)
 #include <linux/config.h>
 #endif
 #include <linux/version.h>

diff --git a/net80211/ieee80211_crypto_wep.c b/net80211/ieee80211_crypto_wep.c
@@ -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>

diff --git a/net80211/ieee80211_input.c b/net80211/ieee80211_input.c
@@ -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>

diff --git a/net80211/ieee80211_linux.c b/net80211/ieee80211_linux.c
@@ -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>

diff --git a/net80211/ieee80211_monitor.c b/net80211/ieee80211_monitor.c
@@ -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>

diff --git a/net80211/ieee80211_node.c b/net80211/ieee80211_node.c
@@ -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>

diff --git a/net80211/ieee80211_output.c b/net80211/ieee80211_output.c
@@ -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>

diff --git a/net80211/ieee80211_power.c b/net80211/ieee80211_power.c
@@ -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>

diff --git a/net80211/ieee80211_proto.c b/net80211/ieee80211_proto.c
@@ -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>

diff --git a/net80211/ieee80211_rate.c b/net80211/ieee80211_rate.c
@@ -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
 

diff --git a/net80211/ieee80211_scan.c b/net80211/ieee80211_scan.c
@@ -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>

diff --git a/net80211/ieee80211_scan_ap.c b/net80211/ieee80211_scan_ap.c
@@ -38,7 +38,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>

diff --git a/net80211/ieee80211_scan_sta.c b/net80211/ieee80211_scan_sta.c
@@ -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>

diff --git a/net80211/ieee80211_skb.c b/net80211/ieee80211_skb.c
@@ -34,7 +34,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>

diff --git a/net80211/ieee80211_wireless.c b/net80211/ieee80211_wireless.c
@@ -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
 

diff --git a/net80211/ieee80211_xauth.c b/net80211/ieee80211_xauth.c
@@ -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>

diff --git a/net80211/if_media.c b/net80211/if_media.c
@@ -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>

diff --git a/regression/ccmp/test_ccmp.c b/regression/ccmp/test_ccmp.c
@@ -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>

diff --git a/regression/tkip/test_tkip.c b/regression/tkip/test_tkip.c
@@ -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>

diff --git a/regression/wep/test_wep.c b/regression/wep/test_wep.c
@@ -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>