[svn-upgrade] new version madwifi (0.9.4+r4136.20110203)

diff --git a/SNAPSHOT b/SNAPSHOT
index 2cc65b0e89358cdd3ea39a494106ef1bee8635a5..89bacb56df5f2cb20ca76b6b562c53b14cfd4629 100644 (file)
--- a/SNAPSHOT
+++ b/SNAPSHOT
@@ -2,7 +2,7 @@ Path: madwifi/branches/madwifi-0.9.4
 URL: http://svn.madwifi-project.org/madwifi/branches/madwifi-0.9.4
 Repository Root: http://svn.madwifi-project.org
 Repository UUID: 0192ed92-7a03-0410-a25b-9323aeb14dbd
-Revision: 4133
+Revision: 4136
 Last Changed Author: proski
-Last Changed Rev: 4133
-Last Changed Date: 2010-06-20 14:13:10 +0200 (Sun, 20 Jun 2010)
+Last Changed Rev: 4136
+Last Changed Date: 2011-02-02 22:22:31 +0100 (Wed, 02 Feb 2011)

diff --git a/ath/if_ath.c b/ath/if_ath.c
index db6cfbb7cf0dcc06714b81999d9b24a507a66f0e..b26e1f56cf9b015aa79aa3e157907805302cb6ae 100644 (file)
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: if_ath.c 4133 2010-06-20 12:13:10Z proski $
+ * $Id: if_ath.c 4136 2011-02-02 21:22:31Z proski $
  */
 
 /*
@@ -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>

diff --git a/ath/if_ath_ahb.c b/ath/if_ath_ahb.c
index 964fc3f64bd25e780b5202e617ae6ac8d803698f..99bf943626e3ff818a95b0fe5257eebd39f81010 100644 (file)
--- a/ath/if_ath_ahb.c
+++ b/ath/if_ath_ahb.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004 Atheros Communications, Inc.
  * All rights reserved
  *
- * $Id: if_ath_ahb.c 4085 2009-08-13 16:45:07Z proski $
+ * $Id: if_ath_ahb.c 4136 2011-02-02 21:22:31Z proski $
  */
 #include "opt_ah.h"
 
@@ -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
index 05ae175aeb46ba3fdb167882ad33f613792e4e15..b378c3bfc1ba9099f50bc73d258a008ef373ac0c 100644 (file)
--- a/ath/if_ath_pci.c
+++ b/ath/if_ath_pci.c
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: if_ath_pci.c 3907 2009-01-14 03:16:12Z proski $
+ * $Id: if_ath_pci.c 4136 2011-02-02 21:22:31Z proski $
  */
 #include "opt_ah.h"
 
@@ -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_hal/ah_os.c b/ath_hal/ah_os.c
index 2308eb955dab80c03d533c13c6221bf13c61549a..e2e739c41e8c4b85095002e9a041d6ff1e2d3502 100644 (file)
--- a/ath_hal/ah_os.c
+++ b/ath_hal/ah_os.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: ah_os.c 4103 2010-01-09 08:47:02Z proski $
+ * $Id: ah_os.c 4136 2011-02-02 21:22:31Z proski $
  */
 #include "opt_ah.h"
 
@@ -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>

diff --git a/ath_rate/amrr/amrr.c b/ath_rate/amrr/amrr.c
index f63086c6c78363280f0d497d0bf65228613983b8..e7f65b87ea2d7b7c6e6ccd8fbf076e090dba919d 100644 (file)
--- a/ath_rate/amrr/amrr.c
+++ b/ath_rate/amrr/amrr.c
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: amrr.c 4103 2010-01-09 08:47:02Z proski $
+ * $Id: amrr.c 4136 2011-02-02 21:22:31Z proski $
  */
 
 /*
@@ -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
index ba6967b001a14ddd80a851db92daad5c75526a2a..e14244ce45196202352867dd6e2971a9f8fddc51 100644 (file)
--- 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
index a20104992744353efc52194807071da921116a00..f384b6637a051ced7974dd730afeeda264ec006b 100644 (file)
--- a/ath_rate/onoe/onoe.c
+++ b/ath_rate/onoe/onoe.c
@@ -33,13 +33,13 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: onoe.c 4103 2010-01-09 08:47:02Z proski $
+ * $Id: onoe.c 4136 2011-02-02 21:22:31Z proski $
  */
 
 /*
  * 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
index e6f53313dffd576189bc7de014e5e94c401db076..2a779c8167a4baae36003ffe9095b279e91a4074 100644 (file)
--- a/ath_rate/sample/sample.c
+++ b/ath_rate/sample/sample.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: sample.c 4098 2009-09-19 04:09:09Z proski $
+ * $Id: sample.c 4136 2011-02-02 21:22:31Z proski $
  */
 
 
@@ -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/contrib/madwifi.spec b/contrib/madwifi.spec
index d8518d0867f79fc46fe8577c073c7186783bd6b6..49c2cc651432fb228695441345b8670fae21b5d6 100644 (file)
--- a/contrib/madwifi.spec
+++ b/contrib/madwifi.spec
@@ -10,8 +10,8 @@
 %define       mykrelver         %(echo %{mykversion} | tr -s '-' '_')
 # Define based on the tar ball extract.
 # Those two variable will be instanced during the tarball generation
-%define       revision       4133
-%define       snapshot       20101223
+%define       revision       4136
+%define       snapshot       20110203
 # branch is not used yet.
 %define       branch         trunk
 Summary: A linux device driver for Atheros chipsets (ar5210, ar5211, ar5212).

diff --git a/net80211/ieee80211.c b/net80211/ieee80211.c
index e1bfe81d4ac61cb5918f87820305362d892adac7..e1176792e26fcfba804acc9c94d583dac3d230a5 100644 (file)
--- a/net80211/ieee80211.c
+++ b/net80211/ieee80211.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211.c 4060 2009-06-25 22:23:39Z proski $
+ * $Id: ieee80211.c 4136 2011-02-02 21:22:31Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -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
index 3dbffbf56298c9c72e6a8e32678d22960b4e7092..541ef7ba2eee92ad81ce988336975eeb7620e9f8 100644 (file)
--- a/net80211/ieee80211_acl.c
+++ b/net80211/ieee80211_acl.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_acl.c 1721 2006-09-20 08:45:13Z mentor $
+ * $Id: ieee80211_acl.c 4136 2011-02-02 21:22:31Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -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
index 18e20b1f51f9490413f50c7547a0636ce3a03737..a248e80d64aad67754c6917107d2854ab2d5458e 100644 (file)
--- a/net80211/ieee80211_beacon.c
+++ b/net80211/ieee80211_beacon.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_beacon.c 3058 2007-12-13 06:21:32Z br1 $
+ * $Id: ieee80211_beacon.c 4136 2011-02-02 21:22:31Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -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
index b78991046309fc958a21dcd283b53bd12c7a5f93..08b5ff0d913c739c6d99b5daeca49cf10864acff 100644 (file)
--- a/net80211/ieee80211_crypto.c
+++ b/net80211/ieee80211_crypto.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_crypto.c 1732 2006-09-24 21:06:25Z mentor $
+ * $Id: ieee80211_crypto.c 4136 2011-02-02 21:22:31Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -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
index c9d644c0cb2fefa2bd02966f447bfadcda82a38f..73724d2cb3440dc2c526447d70c8ccbfcd218ac7 100644 (file)
--- a/net80211/ieee80211_crypto_ccmp.c
+++ b/net80211/ieee80211_crypto_ccmp.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_crypto_ccmp.c 4126 2010-03-23 22:50:36Z proski $
+ * $Id: ieee80211_crypto_ccmp.c 4136 2011-02-02 21:22:31Z proski $
  */
 
 /*
@@ -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>

diff --git a/net80211/ieee80211_crypto_none.c b/net80211/ieee80211_crypto_none.c
index 84e4e5203d5a89baa52f54176e061768a8df26d3..08c0100e34a861795d522a6de28941c5bdc5bbe7 100644 (file)
--- a/net80211/ieee80211_crypto_none.c
+++ b/net80211/ieee80211_crypto_none.c
@@ -28,13 +28,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_crypto_none.c 1721 2006-09-20 08:45:13Z mentor $
+ * $Id: ieee80211_crypto_none.c 4136 2011-02-02 21:22:31Z proski $
  */
 
 /*
  * 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
index a11a5aeb91bf6027dcf92fb4f54ed7f52383aaad..6e15c3654c99360ccfaa28d96402610f8b0b14ba 100644 (file)
--- a/net80211/ieee80211_crypto_tkip.c
+++ b/net80211/ieee80211_crypto_tkip.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_crypto_tkip.c 4126 2010-03-23 22:50:36Z proski $
+ * $Id: ieee80211_crypto_tkip.c 4136 2011-02-02 21:22:31Z proski $
  */
 
 /*
@@ -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>

diff --git a/net80211/ieee80211_crypto_wep.c b/net80211/ieee80211_crypto_wep.c
index 734a5390ff9e97bacaf5304a794d359f72a3e837..09b57fdb47bc00cb033d105a7b4be4f2eb96f89d 100644 (file)
--- a/net80211/ieee80211_crypto_wep.c
+++ b/net80211/ieee80211_crypto_wep.c
@@ -28,13 +28,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_crypto_wep.c 4126 2010-03-23 22:50:36Z proski $
+ * $Id: ieee80211_crypto_wep.c 4136 2011-02-02 21:22:31Z proski $
  */
 
 /*
  * 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
index c64197a4d6145524721c789ff28f5cfdda4d5115..0359755f4532990362d6c394e3ef97442dbd0b28 100644 (file)
--- a/net80211/ieee80211_input.c
+++ b/net80211/ieee80211_input.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_input.c 2610 2007-07-25 15:26:38Z mrenzmann $
+ * $Id: ieee80211_input.c 4136 2011-02-02 21:22:31Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -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
index 21ced6ba4df9d08d79644655de9aa73d91a0a006..132861e5ff745eb99400979a1aeba94e2211131e 100644 (file)
--- a/net80211/ieee80211_linux.c
+++ b/net80211/ieee80211_linux.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_linux.c 4103 2010-01-09 08:47:02Z proski $
+ * $Id: ieee80211_linux.c 4136 2011-02-02 21:22:31Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -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
index 72015c4c30600fa29465c078f46b143738d56a68..eedb60125b0359d47606f05e0eb3452e5bb2543a 100644 (file)
--- a/net80211/ieee80211_monitor.c
+++ b/net80211/ieee80211_monitor.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_monitor.c 3298 2008-01-29 02:21:47Z br1 $
+ * $Id: ieee80211_monitor.c 4136 2011-02-02 21:22:31Z proski $
  */
 
 #ifndef EXPORT_SYMTAB
@@ -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
index 50625b88cbedd616582337585605796b35d621fd..30774aea0ce6abf7ee5f4edecbf321fa10c2f710 100644 (file)
--- a/net80211/ieee80211_node.c
+++ b/net80211/ieee80211_node.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_node.c 2366 2007-05-23 08:43:05Z mrenzmann $
+ * $Id: ieee80211_node.c 4136 2011-02-02 21:22:31Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -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
index 24eecc23a2c967db2681eea52ade892edceda00f..5fa098059263efc3c752779a628f9087fc494518 100644 (file)
--- a/net80211/ieee80211_output.c
+++ b/net80211/ieee80211_output.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_output.c 3907 2009-01-14 03:16:12Z proski $
+ * $Id: ieee80211_output.c 4136 2011-02-02 21:22:31Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -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
index 24d4ab1cc44bf05c552a852352f5affcf270c92c..c8aa16e832052d7a90618b00d6f829bc0e3ffc8e 100644 (file)
--- a/net80211/ieee80211_power.c
+++ b/net80211/ieee80211_power.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_power.c 3696 2008-06-04 08:09:17Z proski $
+ * $Id: ieee80211_power.c 4136 2011-02-02 21:22:31Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -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
index 6f509a0aa8b1d89f039dc7c443384a1f25aa6f01..07dab5716a7579df7db4100038e4410158a52dc6 100644 (file)
--- a/net80211/ieee80211_proto.c
+++ b/net80211/ieee80211_proto.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_proto.c 3907 2009-01-14 03:16:12Z proski $
+ * $Id: ieee80211_proto.c 4136 2011-02-02 21:22:31Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -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
index bf54430fc1e80c56b1a3151cfb26f283fbdeb9f8..0bd1797e10bb3c1f2f54beac02baada7dc4e83ca 100644 (file)
--- 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
index 14ad6eed641cbd1f9bcd38ee093db80a32749182..d3f15628b28a8f38221536c901f691ffb9591716 100644 (file)
--- a/net80211/ieee80211_scan.c
+++ b/net80211/ieee80211_scan.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_scan.c 3302 2008-01-29 09:17:23Z scottr $
+ * $Id: ieee80211_scan.c 4136 2011-02-02 21:22:31Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -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
index f3b12d1a62d6cd9f37428006c1be58956ceda281..31e2330624ac6895ee3127b1fb0e9723a4ed6acf 100644 (file)
--- a/net80211/ieee80211_scan_ap.c
+++ b/net80211/ieee80211_scan_ap.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_scan_ap.c 1721 2006-09-20 08:45:13Z mentor $
+ * $Id: ieee80211_scan_ap.c 4136 2011-02-02 21:22:31Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -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>

diff --git a/net80211/ieee80211_scan_sta.c b/net80211/ieee80211_scan_sta.c
index 8fd3c3c598099716bc794b4b5c414b70f69eea5d..6923fa34446bd5f43a80f9602da6c0f1a6c2f3d8 100644 (file)
--- a/net80211/ieee80211_scan_sta.c
+++ b/net80211/ieee80211_scan_sta.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_scan_sta.c 2749 2007-10-16 08:58:14Z kelmo $
+ * $Id: ieee80211_scan_sta.c 4136 2011-02-02 21:22:31Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -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_wireless.c b/net80211/ieee80211_wireless.c
index 00a16f25c71ee6e365f8c7b25117f2c4d753f01b..7492ffd2d289b976a5aba9ac3f54886278a9de06 100644 (file)
--- a/net80211/ieee80211_wireless.c
+++ b/net80211/ieee80211_wireless.c
@@ -33,13 +33,13 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: ieee80211_wireless.c 4034 2009-06-24 20:40:32Z proski $
+ * $Id: ieee80211_wireless.c 4136 2011-02-02 21:22:31Z proski $
  */
 
 /*
  * 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
index 4a1f2c7a5ee6ab3960085d0bc83cb66702c38b62..22d806f49d8a6647778e3528e3ffc414ea747a1c 100644 (file)
--- a/net80211/ieee80211_xauth.c
+++ b/net80211/ieee80211_xauth.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_xauth.c 1721 2006-09-20 08:45:13Z mentor $
+ * $Id: ieee80211_xauth.c 4136 2011-02-02 21:22:31Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -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
index 90c62116feec4a0e047b8c416cd803bdbe57170b..18b1b6702a1f6b334a28d29b81ec58bb45ec9a21 100644 (file)
--- a/net80211/if_media.c
+++ b/net80211/if_media.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_media.c 1721 2006-09-20 08:45:13Z mentor $
+ * $Id: if_media.c 4136 2011-02-02 21:22:31Z proski $
  */
 
 /*
@@ -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
index e335328563a837dc3962bb684fd2aa4554023797..2253a12c29059f27c0511517b4bf49b703cb5383 100644 (file)
--- a/regression/ccmp/test_ccmp.c
+++ b/regression/ccmp/test_ccmp.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: test_ccmp.c 3847 2008-08-27 16:04:04Z proski $
+ * $Id: test_ccmp.c 4136 2011-02-02 21:22:31Z proski $
  */
 
 /*
@@ -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
index 7d496d0d059a02ee094581154de16ff8199c9517..f94e46e33720be39cc6058509fdaecb7b9561272 100644 (file)
--- a/regression/tkip/test_tkip.c
+++ b/regression/tkip/test_tkip.c
@@ -28,13 +28,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: test_tkip.c 3847 2008-08-27 16:04:04Z proski $
+ * $Id: test_tkip.c 4136 2011-02-02 21:22:31Z proski $
  */
 
 /*
  * 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
index 7a07138782defc11fb0cd71bf1a3ed7f3f451afb..22c3e0f6d0da50e7cb62f35c5526361b6cae318a 100644 (file)
--- a/regression/wep/test_wep.c
+++ b/regression/wep/test_wep.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: test_wep.c 3847 2008-08-27 16:04:04Z proski $
+ * $Id: test_wep.c 4136 2011-02-02 21:22:31Z proski $
  */
 
 /*
@@ -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>