From e408c071a2739a58b2b5e0d91973cd1ab95fa716 Mon Sep 17 00:00:00 2001 From: proski Date: Wed, 2 Feb 2011 21:10:53 +0000 Subject: [PATCH] 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 --- ath/if_ath.c | 2 +- ath/if_ath_ahb.c | 2 +- ath/if_ath_pci.c | 2 +- ath/if_ath_radar.c | 2 +- ath_hal/ah_os.c | 4 ++-- ath_rate/amrr/amrr.c | 2 +- ath_rate/minstrel/minstrel.c | 2 +- ath_rate/onoe/onoe.c | 2 +- ath_rate/sample/sample.c | 2 +- net80211/ieee80211.c | 2 +- net80211/ieee80211_acl.c | 2 +- net80211/ieee80211_beacon.c | 2 +- net80211/ieee80211_crypto.c | 2 +- net80211/ieee80211_crypto_ccmp.c | 2 +- net80211/ieee80211_crypto_none.c | 2 +- net80211/ieee80211_crypto_tkip.c | 2 +- net80211/ieee80211_crypto_wep.c | 2 +- net80211/ieee80211_input.c | 2 +- net80211/ieee80211_linux.c | 2 +- net80211/ieee80211_monitor.c | 2 +- net80211/ieee80211_node.c | 2 +- net80211/ieee80211_output.c | 2 +- net80211/ieee80211_power.c | 2 +- net80211/ieee80211_proto.c | 2 +- net80211/ieee80211_rate.c | 2 +- net80211/ieee80211_scan.c | 2 +- net80211/ieee80211_scan_ap.c | 2 +- net80211/ieee80211_scan_sta.c | 2 +- net80211/ieee80211_skb.c | 2 +- net80211/ieee80211_wireless.c | 2 +- net80211/ieee80211_xauth.c | 2 +- net80211/if_media.c | 2 +- regression/ccmp/test_ccmp.c | 2 +- regression/tkip/test_tkip.c | 2 +- regression/wep/test_wep.c | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ath/if_ath.c b/ath/if_ath.c index b79a2fa..f619733 100644 --- 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 #endif #include diff --git a/ath/if_ath_ahb.c b/ath/if_ath_ahb.c index eab9f7b..9b5e9d8 100644 --- 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 #endif #include diff --git a/ath/if_ath_pci.c b/ath/if_ath_pci.c index 71e0fe7..ae6072e 100644 --- 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 #endif #include diff --git a/ath/if_ath_radar.c b/ath/if_ath_radar.c index f48e48f..039824e 100644 --- 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 #endif #include diff --git a/ath_hal/ah_os.c b/ath_hal/ah_os.c index a320985..e4c2074 100644 --- 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 -#endif /* AUTOCONF_INCLUDED */ +#endif #include #include #include diff --git a/ath_rate/amrr/amrr.c b/ath_rate/amrr/amrr.c index c2ec5b8..70b431f 100644 --- 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 #endif #include diff --git a/ath_rate/minstrel/minstrel.c b/ath_rate/minstrel/minstrel.c index 75e4343..e3d4c6d 100644 --- 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 #endif diff --git a/ath_rate/onoe/onoe.c b/ath_rate/onoe/onoe.c index 14879d6..8b3f489 100644 --- 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 #endif #include diff --git a/ath_rate/sample/sample.c b/ath_rate/sample/sample.c index 8417346..319db83 100644 --- 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 #endif #include diff --git a/net80211/ieee80211.c b/net80211/ieee80211.c index fd39f6f..2bca9e3 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_acl.c b/net80211/ieee80211_acl.c index 5581f29..8cf9458 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_beacon.c b/net80211/ieee80211_beacon.c index f9316d9..5f0d36e 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_crypto.c b/net80211/ieee80211_crypto.c index 7da07aa..a8d4787 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_crypto_ccmp.c b/net80211/ieee80211_crypto_ccmp.c index 8d1e7d3..f9cc65b 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_crypto_none.c b/net80211/ieee80211_crypto_none.c index 0fe7574..4b5ce17 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_crypto_tkip.c b/net80211/ieee80211_crypto_tkip.c index 0f2e79b..74c5389 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_crypto_wep.c b/net80211/ieee80211_crypto_wep.c index 281512e..25ec91e 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_input.c b/net80211/ieee80211_input.c index 70a2748..ac903e5 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_linux.c b/net80211/ieee80211_linux.c index e2a8903..a7e7bc7 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_monitor.c b/net80211/ieee80211_monitor.c index 4108c4e..a24ed46 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_node.c b/net80211/ieee80211_node.c index 1bed7ed..75874e3 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_output.c b/net80211/ieee80211_output.c index 5e0cc55..34c0600 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_power.c b/net80211/ieee80211_power.c index db2f823..8b491f7 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_proto.c b/net80211/ieee80211_proto.c index f5ef316..ec75a9f 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_rate.c b/net80211/ieee80211_rate.c index 906c508..14fa8a5 100644 --- 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 #endif diff --git a/net80211/ieee80211_scan.c b/net80211/ieee80211_scan.c index 4bf14bf..f52a21c 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_scan_ap.c b/net80211/ieee80211_scan_ap.c index d7866a5..0192307 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_scan_sta.c b/net80211/ieee80211_scan_sta.c index 8835882..19376ae 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_skb.c b/net80211/ieee80211_skb.c index c881cf5..2349242 100644 --- 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 #endif #include diff --git a/net80211/ieee80211_wireless.c b/net80211/ieee80211_wireless.c index f8b2327..c6340a1 100644 --- 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 #endif diff --git a/net80211/ieee80211_xauth.c b/net80211/ieee80211_xauth.c index 8e9c6c1..4cf2620 100644 --- 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 #endif #include diff --git a/net80211/if_media.c b/net80211/if_media.c index 97f7368..996d021 100644 --- 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 #endif #include diff --git a/regression/ccmp/test_ccmp.c b/regression/ccmp/test_ccmp.c index ff755d4..80be62f 100644 --- 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 #endif #include diff --git a/regression/tkip/test_tkip.c b/regression/tkip/test_tkip.c index c6efb7e..da3f0f4 100644 --- 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 #endif #include diff --git a/regression/wep/test_wep.c b/regression/wep/test_wep.c index 977408e..b697177 100644 --- 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 #endif #include