add 1:0.9.4+r4119.20100201-0.1

diff --git a/Makefile b/Makefile
index 6d0bcfd399da8a4b38ceb9d488b47ac4d3dc58e7..7910dddb5bbba02271b142dc2176058c0cdc57cb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ endif
 
 all: modules tools
 
-modules: configcheck svnversion.h
+modules: configcheck $(TOP)/svnversion.h
 ifdef LINUX24
        for i in $(obj-y); do \
                $(MAKE) -C $$i || exit 1; \
@@ -64,17 +64,22 @@ else
        $(MAKE) -C $(KERNELPATH) SUBDIRS=$(shell pwd) modules
 endif
 
-.PHONY: svnversion.h
-svnversion.h:
-       @if [ -d .svn ]; then \
-               ver=`svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'`; \
+$(addprefix $(obj)/, $(obj-y:/=)): $(TOP)/svnversion.h
+
+$(TOP)/svnversion.h:
+       @cd $(TOP) && \
+       if [ -d .svn ]; then \
+               ver=$$(svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'); \
                echo "#define SVNVERSION \"svn r$$ver\"" > $@.tmp; \
+       elif [ -d .git ]; then \
+               ver=$$(git svn log | head -n2 | tail -n1 | cut -d\  -f1); \
+               echo "#define SVNVERSION \"svn $$ver\"" > $@.tmp; \
        elif [ -s SNAPSHOT ]; then \
-               ver=`sed -e '/^Revision: */!d;s///;q' SNAPSHOT`; \
+               ver=$$(sed -e '/^Revision: */!d;s///;q' SNAPSHOT); \
                echo "#define SVNVERSION \"svn r$$ver\"" > $@.tmp; \
        else \
                touch $@.tmp; \
-       fi; \
+       fi || exit 1; \
        diff $@ $@.tmp >/dev/null 2>&1 || cp -f $@.tmp $@; rm -f $@.tmp
 
 # conflicts with the 'tools' subdirectory

diff --git a/SNAPSHOT b/SNAPSHOT
index aa6dbfdff38352d935228e1710165e8b85b21471..6ade48aa904c2c8e7d699b37bead5ab8a07c6c7a 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: 4100
+Revision: 4119
 Last Changed Author: proski
-Last Changed Rev: 4100
-Last Changed Date: 2009-09-29 01:07:12 +0200 (Tue, 29 Sep 2009)
+Last Changed Rev: 4119
+Last Changed Date: 2010-01-31 08:06:30 +0100 (Sun, 31 Jan 2010)

diff --git a/ath/if_ath.c b/ath/if_ath.c
index 76532aabbcb70c11ef03bdac98e5693081d706c4..a3c5b05c6f6ea3ffee7f065b08d8865413529543 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 4005 2009-04-15 12:04:43Z proski $
+ * $Id: if_ath.c 4103 2010-01-09 08:47:02Z proski $
  */
 
 /*
@@ -9586,119 +9586,119 @@ static int mincalibrate = 1;                  /* once a second */
 static int maxint = 0x7fffffff;                /* 32-bit big */
 
 static const ctl_table ath_sysctl_template[] = {
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "slottime",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_SLOTTIME,
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "acktimeout",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_ACKTIMEOUT,
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "ctstimeout",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_CTSTIMEOUT,
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "softled",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_SOFTLED,
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "ledpin",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_LEDPIN,
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "countrycode",
          .mode         = 0444,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_COUNTRYCODE,
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "maxvaps",
          .mode         = 0444,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_MAXVAPS,
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "regdomain",
          .mode         = 0444,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_REGDOMAIN,
        },
 #ifdef AR_DEBUG
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "debug",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_DEBUG,
        },
 #endif
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "txantenna",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_TXANTENNA,
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "rxantenna",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_RXANTENNA,
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "diversity",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_DIVERSITY,
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "txintrperiod",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_TXINTRPERIOD,
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "fftxqmin",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_FFTXQMIN,
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "tkipmic",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_TKIPMIC,
        },
 #ifdef ATH_SUPERG_XR
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "xrpollperiod",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_XR_POLL_PERIOD,
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "xrpollcount",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_XR_POLL_COUNT,
        },
 #endif
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "ackrate",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_ACKRATE,
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "intmit",
          .mode         = 0644,
          .proc_handler = ath_sysctl_halparam,
@@ -9736,12 +9736,12 @@ ath_dynamic_sysctl_register(struct ath_softc *sc)
 
        /* setup the table */
        memset(sc->sc_sysctls, 0, space);
-       sc->sc_sysctls[0].ctl_name = CTL_DEV;
+       ATH_SET_CTL_NAME(sc->sc_sysctls[0], CTL_DEV);
        sc->sc_sysctls[0].procname = "dev";
        sc->sc_sysctls[0].mode = 0555;
        sc->sc_sysctls[0].child = &sc->sc_sysctls[2];
        /* [1] is NULL terminator */
-       sc->sc_sysctls[2].ctl_name = CTL_AUTO;
+       ATH_SET_CTL_NAME(sc->sc_sysctls[2], CTL_AUTO);
        sc->sc_sysctls[2].procname = dev_name;
        sc->sc_sysctls[2].mode = 0555;
        sc->sc_sysctls[2].child = &sc->sc_sysctls[4];
@@ -9844,7 +9844,7 @@ ath_announce(struct net_device *dev)
  */
 static ctl_table ath_static_sysctls[] = {
 #ifdef AR_DEBUG
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "debug",
          .mode         = 0644,
          .data         = &ath_debug,
@@ -9852,35 +9852,35 @@ static ctl_table ath_static_sysctls[] = {
          .proc_handler = proc_dointvec
        },
 #endif
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "countrycode",
          .mode         = 0444,
          .data         = &ath_countrycode,
          .maxlen       = sizeof(ath_countrycode),
          .proc_handler = proc_dointvec
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "maxvaps",
          .mode         = 0444,
          .data         = &ath_maxvaps,
          .maxlen       = sizeof(ath_maxvaps),
          .proc_handler = proc_dointvec
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "outdoor",
          .mode         = 0444,
          .data         = &ath_outdoor,
          .maxlen       = sizeof(ath_outdoor),
          .proc_handler = proc_dointvec
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "xchanmode",
          .mode         = 0444,
          .data         = &ath_xchanmode,
          .maxlen       = sizeof(ath_xchanmode),
          .proc_handler = proc_dointvec
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "calibrate",
          .mode         = 0644,
          .data         = &ath_calinterval,
@@ -9892,14 +9892,14 @@ static ctl_table ath_static_sysctls[] = {
        { 0 }
 };
 static ctl_table ath_ath_table[] = {
-       { .ctl_name     = DEV_ATH,
+       { ATH_INIT_CTL_NAME(DEV_ATH)
          .procname     = "ath",
          .mode         = 0555,
          .child        = ath_static_sysctls
        }, { 0 }
 };
 static ctl_table ath_root_table[] = {
-       { .ctl_name     = CTL_DEV,
+       { ATH_INIT_CTL_NAME(CTL_DEV)
          .procname     = "dev",
          .mode         = 0555,
          .child        = ath_ath_table

diff --git a/ath/if_athvar.h b/ath/if_athvar.h
index adb94e494bdcb9ef28dc29be9b3439193646f67b..36fc3a75cdd6d95e16e2ef7592034cd6c2afecba 100644 (file)
--- a/ath/if_athvar.h
+++ b/ath/if_athvar.h
@@ -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_athvar.h 4100 2009-09-28 23:07:12Z proski $
+ * $Id: if_athvar.h 4119 2010-01-31 07:06:30Z proski $
  */
 
 /*
@@ -743,8 +743,13 @@ typedef void (*ath_callback) (struct ath_softc *);
        spin_unlock_irqrestore(&(_sc)->sc_rxbuflock, __rxbuflockflags);
 
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+#include <linux/semaphore.h>
+#else
+#include <asm/semaphore.h>
+#endif
 /* Protects the device from concurrent accesses */
-#define        ATH_LOCK_INIT(_sc)              init_MUTEX(&(_sc)->sc_lock)
+#define        ATH_LOCK_INIT(_sc)              sema_init(&(_sc)->sc_lock, 1)
 #define        ATH_LOCK_DESTROY(_sc)
 #define        ATH_LOCK(_sc)                   down(&(_sc)->sc_lock)
 #define        ATH_UNLOCK(_sc)                 up(&(_sc)->sc_lock)

diff --git a/ath_hal/ah_os.c b/ath_hal/ah_os.c
index 8d1dc07473d694d99720474e32f003c798b91b67..2308eb955dab80c03d533c13c6221bf13c61549a 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 4073 2009-07-07 00:59:47Z proski $
+ * $Id: ah_os.c 4103 2010-01-09 08:47:02Z proski $
  */
 #include "opt_ah.h"
 
@@ -436,7 +436,7 @@ EXPORT_SYMBOL(ath_hal_memcmp);
 
 static ctl_table ath_hal_sysctls[] = {
 #ifdef AH_DEBUG
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "debug",
          .mode         = 0644,
          .data         = &ath_hal_debug,
@@ -444,21 +444,21 @@ static ctl_table ath_hal_sysctls[] = {
          .proc_handler = proc_dointvec
        },
 #endif
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "dma_beacon_response_time",
          .data         = &ath_hal_dma_beacon_response_time,
          .maxlen       = sizeof(ath_hal_dma_beacon_response_time),
          .mode         = 0644,
          .proc_handler = proc_dointvec
        },
-       { .ctl_name     = CTL_AUTO,     
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "sw_beacon_response_time",
          .mode         = 0644,
          .data         = &ath_hal_sw_beacon_response_time,
          .maxlen       = sizeof(ath_hal_sw_beacon_response_time),
          .proc_handler = proc_dointvec
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "swba_backoff",
          .mode         = 0644,
          .data         = &ath_hal_additional_swba_backoff,
@@ -466,19 +466,19 @@ static ctl_table ath_hal_sysctls[] = {
          .proc_handler = proc_dointvec
        },
 #ifdef AH_DEBUG_ALQ
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "alq",
          .mode         = 0644,
          .proc_handler = sysctl_hw_ath_hal_log
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "alq_size",
          .mode         = 0644,
          .data         = &ath_hal_alq_qsize,
          .maxlen       = sizeof(ath_hal_alq_qsize),
          .proc_handler = proc_dointvec
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "alq_lost",
          .mode         = 0644,
          .data         = &ath_hal_alq_lost,
@@ -489,21 +489,21 @@ static ctl_table ath_hal_sysctls[] = {
        { 0 }
 };
 static ctl_table ath_hal_table[] = {
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "hal",
          .mode         = 0555,
          .child        = ath_hal_sysctls
        }, { 0 }
 };
 static ctl_table ath_ath_table[] = {
-       { .ctl_name     = DEV_ATH,
+       { ATH_INIT_CTL_NAME(DEV_ATH)
          .procname     = "ath",
          .mode         = 0555,
          .child        = ath_hal_table
        }, { 0 }
 };
 static ctl_table ath_root_table[] = {
-       { .ctl_name     = CTL_DEV,
+       { ATH_INIT_CTL_NAME(CTL_DEV)
          .procname     = "dev",
          .mode         = 0555,
          .child        = ath_ath_table

diff --git a/ath_rate/amrr/amrr.c b/ath_rate/amrr/amrr.c
index 182f323544bd7a33f7994e956357b37ff8672f77..f63086c6c78363280f0d497d0bf65228613983b8 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 4096 2009-09-03 21:10:20Z proski $
+ * $Id: amrr.c 4103 2010-01-09 08:47:02Z proski $
  */
 
 /*
@@ -497,7 +497,7 @@ static int min_threshold = 1;
  */
 
 static ctl_table ath_rate_static_sysctls[] = {
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "interval",
          .mode         = 0644,
          .data         = &ath_rateinterval,
@@ -506,7 +506,7 @@ static ctl_table ath_rate_static_sysctls[] = {
          .extra2       = &maxint,
          .proc_handler = proc_dointvec_minmax
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "max_success_threshold",
          .mode         = 0644,
          .data         = &ath_rate_max_success_threshold,
@@ -515,7 +515,7 @@ static ctl_table ath_rate_static_sysctls[] = {
          .extra2       = &maxint,
          .proc_handler = proc_dointvec_minmax
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "min_success_threshold",
          .mode         = 0644,
          .data         = &ath_rate_min_success_threshold,
@@ -527,21 +527,21 @@ static ctl_table ath_rate_static_sysctls[] = {
        { 0 }
 };
 static ctl_table ath_rate_table[] = {
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "rate",
          .mode         = 0555,
          .child        = ath_rate_static_sysctls
        }, { 0 }
 };
 static ctl_table ath_ath_table[] = {
-       { .ctl_name     = DEV_ATH,
+       { ATH_INIT_CTL_NAME(DEV_ATH)
          .procname     = "ath",
          .mode         = 0555,
          .child        = ath_rate_table
        }, { 0 }
 };
 static ctl_table ath_root_table[] = {
-       { .ctl_name     = CTL_DEV,
+       { ATH_INIT_CTL_NAME(CTL_DEV)
          .procname     = "dev",
          .mode         = 0555,
          .child        = ath_ath_table

diff --git a/ath_rate/onoe/onoe.c b/ath_rate/onoe/onoe.c
index 35964fb272649831632a310b6143d518543451d8..a20104992744353efc52194807071da921116a00 100644 (file)
--- a/ath_rate/onoe/onoe.c
+++ b/ath_rate/onoe/onoe.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: onoe.c 4096 2009-09-03 21:10:20Z proski $
+ * $Id: onoe.c 4103 2010-01-09 08:47:02Z proski $
  */
 
 /*
@@ -444,7 +444,7 @@ static int maxint = 0x7fffffff;             /* 32-bit big */
  * Static (i.e. global) sysctls.
  */
 static ctl_table ath_rate_static_sysctls[] = {
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "interval",
          .mode         = 0644,
          .data         = &ath_rateinterval,
@@ -453,7 +453,7 @@ static ctl_table ath_rate_static_sysctls[] = {
          .extra2       = &maxint,
          .proc_handler = proc_dointvec_minmax
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "raise",
          .mode         = 0644,
          .data         = &ath_rate_raise,
@@ -462,7 +462,7 @@ static ctl_table ath_rate_static_sysctls[] = {
          .extra2       = &maxpercent,
          .proc_handler = proc_dointvec_minmax
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "raise_threshold",
          .mode         = 0644,
          .data         = &ath_rate_raise_threshold,
@@ -472,21 +472,21 @@ static ctl_table ath_rate_static_sysctls[] = {
        { 0 }
 };
 static ctl_table ath_rate_table[] = {
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "rate",
          .mode         = 0555,
          .child        = ath_rate_static_sysctls
        }, { 0 }
 };
 static ctl_table ath_ath_table[] = {
-       { .ctl_name     = DEV_ATH,
+       { ATH_INIT_CTL_NAME(DEV_ATH)
          .procname     = "ath",
          .mode         = 0555,
          .child        = ath_rate_table
        }, { 0 }
 };
 static ctl_table ath_root_table[] = {
-       { .ctl_name     = CTL_DEV,
+       { ATH_INIT_CTL_NAME(CTL_DEV)
          .procname     = "dev",
          .mode         = 0555,
          .child        = ath_ath_table

diff --git a/contrib/madwifi.spec b/contrib/madwifi.spec
index 92505cfed665a604e719c68f2cbe856f1da0be86..7c2e3d40e1118e2e712d2fc8491cfc9fed5fde99 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       4100
-%define       snapshot       20090929
+%define       revision       4119
+%define       snapshot       20100201
 # branch is not used yet.
 %define       branch         trunk
 Summary: A linux device driver for Atheros chipsets (ar5210, ar5211, ar5212).

diff --git a/debian/changelog b/debian/changelog
index 2d7ea0ae23c104701cd3df5dcdb888b3aa21f806..18638d45a56781466a88baf10e1bef712c8d5382 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+madwifi (1:0.9.4+r4119.20100201-0.1) experimental; urgency=low
+
+  * NMU.
+  * New upstream SVN snapshot.
+
+ -- gregor herrmann <gregoa@debian.org>  Sun, 28 Feb 2010 00:11:09 +0100
+
 madwifi (1:0.9.4+r4100.20090929-0.1) experimental; urgency=low
 
   * NMU.

diff --git a/include/compat.h b/include/compat.h
index 324e9de1c95121fbf59cc21a312230f63966b5be..baeaeee221502c64346d518f6f47b429d5157a57 100644 (file)
--- a/include/compat.h
+++ b/include/compat.h
@@ -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: compat.h 3907 2009-01-14 03:16:12Z proski $
+ * $Id: compat.h 4103 2010-01-09 08:47:02Z proski $
  */
 #ifndef _ATH_COMPAT_H_
 #define _ATH_COMPAT_H_
@@ -177,6 +177,14 @@ static inline void *_kzalloc(size_t size, gfp_t flags)
 #define DEV_ATH CTL_UNNUMBERED
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
+#define ATH_INIT_CTL_NAME(val)
+#define ATH_SET_CTL_NAME(ctl, val)
+#else
+#define ATH_INIT_CTL_NAME(val) .ctl_name = val,
+#define ATH_SET_CTL_NAME(ctl, val) ctl.ctl_name = val
+#endif
+
 /* __skb_append got a third parameter in 2.6.14 */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
 #define __skb_queue_after(_list, _old, _new)   __skb_append(_old, _new)

diff --git a/kernelversion.c b/kernelversion.c
index a21697807e55bda77ac18d91a2b057f0d3d3724b..9d3645cd7adc8d64a304bb8f9aeaf6c619afec0e 100644 (file)
--- a/kernelversion.c
+++ b/kernelversion.c
@@ -4,13 +4,18 @@
  * file.
  * Taken from the lm_sensors project.
  *
- * $Id: kernelversion.c 1669 2006-07-05 02:21:30Z proski $
+ * $Id: kernelversion.c 4103 2010-01-09 08:47:02Z proski $
  */
 #include <linux/version.h>
 
-/* Linux 2.6.18+ uses <linux/utsrelease.h> */
 #ifndef UTS_RELEASE
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
+/* Linux 2.6.33+ uses <generated/utsrelease.h> */
+#include <generated/utsrelease.h>
+#else
+/* Linux 2.6.18 - 2.6.32 uses <linux/utsrelease.h> */
 #include <linux/utsrelease.h>
 #endif
+#endif
 
 char *uts_release = UTS_RELEASE;

diff --git a/net80211/ieee80211_linux.c b/net80211/ieee80211_linux.c
index e1b31e052a6f38ed2f1294a9bc1078c98be7f501..21ced6ba4df9d08d79644655de9aa73d91a0a006 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 4089 2009-08-24 22:04:56Z proski $
+ * $Id: ieee80211_linux.c 4103 2010-01-09 08:47:02Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -621,39 +621,39 @@ IEEE80211_SYSCTL_DECL(ieee80211_sysctl_monitor_crc_errors, ctl, write, filp, buf
 
 static const ctl_table ieee80211_sysctl_template[] = {
 #ifdef IEEE80211_DEBUG
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "debug",
          .mode         = 0644,
          .proc_handler = ieee80211_sysctl_debug
        },
 #endif
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "dev_type",
          .mode         = 0644,
          .proc_handler = ieee80211_sysctl_dev_type
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "monitor_nods_only",
          .mode         = 0644,
          .proc_handler = ieee80211_sysctl_monitor_nods_only
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "monitor_txf_len",
          .mode         = 0644,
          .proc_handler = ieee80211_sysctl_monitor_txf_len
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "monitor_phy_errors",
          .mode         = 0644,
          .proc_handler = ieee80211_sysctl_monitor_phy_errors
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "monitor_crc_errors",
          .mode         = 0644,
          .proc_handler = ieee80211_sysctl_monitor_crc_errors
        },
        /* NB: must be last entry before NULL */
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "%parent",
          .maxlen       = IFNAMSIZ,
          .mode         = 0444,
@@ -688,12 +688,12 @@ ieee80211_sysctl_vattach(struct ieee80211vap *vap)
 
        /* setup the table */
        memset(vap->iv_sysctls, 0, space);
-       vap->iv_sysctls[0].ctl_name = CTL_NET;
+       ATH_SET_CTL_NAME(vap->iv_sysctls[0], CTL_NET);
        vap->iv_sysctls[0].procname = "net";
        vap->iv_sysctls[0].mode = 0555;
        vap->iv_sysctls[0].child = &vap->iv_sysctls[2];
        /* [1] is NULL terminator */
-       vap->iv_sysctls[2].ctl_name = CTL_AUTO;
+       ATH_SET_CTL_NAME(vap->iv_sysctls[2], CTL_AUTO);
        vap->iv_sysctls[2].procname = devname; /* XXX bad idea? */
        vap->iv_sysctls[2].mode = 0555;
        vap->iv_sysctls[2].child = &vap->iv_sysctls[4];

diff --git a/release.h b/release.h
index 8a0cf9bf42730da45953312f8a65af8890a40e08..4d10773739224b1d60925955cddfb349b8a05aef 100644 (file)
--- a/release.h
+++ b/release.h
@@ -33,13 +33,14 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: release.h 3357 2008-02-13 05:17:16Z mrenzmann $
+ * $Id: release.h 4117 2010-01-25 23:00:25Z proski $
  */
+#include "svnversion.h"
 
 #define        RELEASE_TYPE    "BETA"
 
 #ifdef SVNVERSION
-#define RELEASE_VERSION        SVNVERSION
+#define RELEASE_VERSION        SVNVERSION " (branch madwifi-0.9.4)"
 #else
 #define RELEASE_VERSION        "0.9.4.1"
 #endif