madwifi: refresh patches

SVN-Revision: 11316

diff --git a/package/madwifi/patches/102-multicall_binary.patch b/package/madwifi/patches/102-multicall_binary.patch
index 3fa40eb708b0d4c386cb6f8047250b7aefd5bd92..f9ef3f3462638eb867aa3f81f6a280d783258111 100644 (file)
--- a/package/madwifi/patches/102-multicall_binary.patch
+++ b/package/madwifi/patches/102-multicall_binary.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/tools/80211debug.c
 ===================================================================
---- madwifi-trunk-r3314.orig/tools/80211debug.c        2008-05-19 13:58:46.000000000 +0200
-+++ madwifi-trunk-r3314/tools/80211debug.c     2008-05-19 14:15:10.000000000 +0200
+--- madwifi-trunk-r3314.orig/tools/80211debug.c
++++ madwifi-trunk-r3314/tools/80211debug.c
 @@ -48,6 +48,7 @@
  #include <ctype.h>
  #include <getopt.h>
@@ -21,8 +21,8 @@ Index: madwifi-trunk-r3314/tools/80211debug.c
        const char *cp, *tp;
 Index: madwifi-trunk-r3314/tools/80211stats.c
 ===================================================================
---- madwifi-trunk-r3314.orig/tools/80211stats.c        2008-05-19 13:58:46.000000000 +0200
-+++ madwifi-trunk-r3314/tools/80211stats.c     2008-05-19 14:16:17.000000000 +0200
+--- madwifi-trunk-r3314.orig/tools/80211stats.c
++++ madwifi-trunk-r3314/tools/80211stats.c
 @@ -59,6 +59,7 @@
  #include "net80211/ieee80211.h"
  #include "net80211/ieee80211_crypto.h"
@@ -42,8 +42,8 @@ Index: madwifi-trunk-r3314/tools/80211stats.c
        struct ieee80211req_sta_info *si;
 Index: madwifi-trunk-r3314/tools/athchans.c
 ===================================================================
---- madwifi-trunk-r3314.orig/tools/athchans.c  2008-05-19 13:58:46.000000000 +0200
-+++ madwifi-trunk-r3314/tools/athchans.c       2008-05-19 14:15:28.000000000 +0200
+--- madwifi-trunk-r3314.orig/tools/athchans.c
++++ madwifi-trunk-r3314/tools/athchans.c
 @@ -58,6 +58,7 @@
  #include "net80211/ieee80211.h"
  #include "net80211/ieee80211_crypto.h"
@@ -65,8 +65,8 @@ Index: madwifi-trunk-r3314/tools/athchans.c
        struct ieee80211req_chanlist chanlist;
 Index: madwifi-trunk-r3314/tools/athctrl.c
 ===================================================================
---- madwifi-trunk-r3314.orig/tools/athctrl.c   2008-05-19 13:58:46.000000000 +0200
-+++ madwifi-trunk-r3314/tools/athctrl.c        2008-05-19 14:15:44.000000000 +0200
+--- madwifi-trunk-r3314.orig/tools/athctrl.c
++++ madwifi-trunk-r3314/tools/athctrl.c
 @@ -52,6 +52,7 @@
  #include <err.h>
  
@@ -86,8 +86,8 @@ Index: madwifi-trunk-r3314/tools/athctrl.c
        int distance = -1;
 Index: madwifi-trunk-r3314/tools/athdebug.c
 ===================================================================
---- madwifi-trunk-r3314.orig/tools/athdebug.c  2008-05-19 13:58:46.000000000 +0200
-+++ madwifi-trunk-r3314/tools/athdebug.c       2008-05-19 14:15:59.000000000 +0200
+--- madwifi-trunk-r3314.orig/tools/athdebug.c
++++ madwifi-trunk-r3314/tools/athdebug.c
 @@ -51,6 +51,7 @@
  #include <ctype.h>
  #include <getopt.h>
@@ -107,8 +107,8 @@ Index: madwifi-trunk-r3314/tools/athdebug.c
        const char *ifname = "wifi0";
 Index: madwifi-trunk-r3314/tools/athkey.c
 ===================================================================
---- madwifi-trunk-r3314.orig/tools/athkey.c    2008-05-19 13:58:46.000000000 +0200
-+++ madwifi-trunk-r3314/tools/athkey.c 2008-05-19 14:13:06.000000000 +0200
+--- madwifi-trunk-r3314.orig/tools/athkey.c
++++ madwifi-trunk-r3314/tools/athkey.c
 @@ -58,6 +58,7 @@
  #include "net80211/ieee80211.h"
  #include "net80211/ieee80211_crypto.h"
@@ -129,8 +129,8 @@ Index: madwifi-trunk-r3314/tools/athkey.c
        struct ieee80211req_key setkey;
 Index: madwifi-trunk-r3314/tools/athstats.c
 ===================================================================
---- madwifi-trunk-r3314.orig/tools/athstats.c  2008-05-19 13:58:46.000000000 +0200
-+++ madwifi-trunk-r3314/tools/athstats.c       2008-05-19 14:13:44.000000000 +0200
+--- madwifi-trunk-r3314.orig/tools/athstats.c
++++ madwifi-trunk-r3314/tools/athstats.c
 @@ -65,6 +65,7 @@
  
  #undef ARRAY_SIZE
@@ -150,8 +150,8 @@ Index: madwifi-trunk-r3314/tools/athstats.c
        const char *ifname = "wifi0";
 Index: madwifi-trunk-r3314/tools/do_multi.c
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ madwifi-trunk-r3314/tools/do_multi.c       2008-05-19 14:56:28.000000000 +0200
+--- /dev/null
++++ madwifi-trunk-r3314/tools/do_multi.c
 @@ -0,0 +1,32 @@
 +#include <string.h>
 +#include "do_multi.h"
@@ -187,8 +187,8 @@ Index: madwifi-trunk-r3314/tools/do_multi.c
 +}
 Index: madwifi-trunk-r3314/tools/do_multi.h
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ madwifi-trunk-r3314/tools/do_multi.h       2008-05-19 14:42:44.000000000 +0200
+--- /dev/null
++++ madwifi-trunk-r3314/tools/do_multi.h
 @@ -0,0 +1,15 @@
 +#ifdef DO_MULTI
 +int a80211debug_init(int argc, char *argv[]);
@@ -207,8 +207,8 @@ Index: madwifi-trunk-r3314/tools/do_multi.h
 +#endif
 Index: madwifi-trunk-r3314/tools/Makefile
 ===================================================================
---- madwifi-trunk-r3314.orig/tools/Makefile    2008-05-19 13:58:46.000000000 +0200
-+++ madwifi-trunk-r3314/tools/Makefile 2008-05-19 14:56:55.000000000 +0200
+--- madwifi-trunk-r3314.orig/tools/Makefile
++++ madwifi-trunk-r3314/tools/Makefile
 @@ -46,56 +46,55 @@
  HAL=   $(TOP)/hal
  endif
@@ -295,8 +295,8 @@ Index: madwifi-trunk-r3314/tools/Makefile
 +      rm -f $(ALLPROGS) madwifi_multi *.o core a.out
 Index: madwifi-trunk-r3314/tools/wlanconfig.c
 ===================================================================
---- madwifi-trunk-r3314.orig/tools/wlanconfig.c        2008-05-19 13:58:46.000000000 +0200
-+++ madwifi-trunk-r3314/tools/wlanconfig.c     2008-05-19 14:14:07.000000000 +0200
+--- madwifi-trunk-r3314.orig/tools/wlanconfig.c
++++ madwifi-trunk-r3314/tools/wlanconfig.c
 @@ -61,6 +61,7 @@
  #include "net80211/ieee80211.h"
  #include "net80211/ieee80211_crypto.h"
@@ -316,8 +316,8 @@ Index: madwifi-trunk-r3314/tools/wlanconfig.c
        unsigned char bnounit = 0;
 Index: madwifi-trunk-r3314/tools/ath_info.c
 ===================================================================
---- madwifi-trunk-r3314.orig/tools/ath_info.c  2008-05-19 13:58:46.000000000 +0200
-+++ madwifi-trunk-r3314/tools/ath_info.c       2008-05-19 14:44:45.000000000 +0200
+--- madwifi-trunk-r3314.orig/tools/ath_info.c
++++ madwifi-trunk-r3314/tools/ath_info.c
 @@ -98,6 +98,7 @@
  #include <sys/mman.h>
  #include <endian.h>

diff --git a/package/madwifi/patches/104-autocreate_none.patch b/package/madwifi/patches/104-autocreate_none.patch
index f867bd52191fcc11c283347583015f9f26eed3d3..b8c19fb4b5ae0ce32f2965faa195233e01167a61 100644 (file)
--- a/package/madwifi/patches/104-autocreate_none.patch
+++ b/package/madwifi/patches/104-autocreate_none.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 18:10:46.203147359 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 18:10:47.047195460 +0100
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
 @@ -516,7 +516,7 @@
        HAL_STATUS status;
        int error = 0;

diff --git a/package/madwifi/patches/105-ratectl_attach.patch b/package/madwifi/patches/105-ratectl_attach.patch
index 7aed2e53fbd4e0d521e69201929071bb00f49f55..77b2357a5c61d9a604b243f1383dddb5d4c9a9f1 100644 (file)
--- a/package/madwifi/patches/105-ratectl_attach.patch
+++ b/package/madwifi/patches/105-ratectl_attach.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/net80211/ieee80211_rate.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_rate.c 2008-02-20 18:10:46.171145535 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_rate.c      2008-02-20 18:10:47.259207542 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_rate.c
++++ madwifi-trunk-r3314/net80211/ieee80211_rate.c
 @@ -100,8 +100,18 @@
                ieee80211_load_module(buf);
  

diff --git a/package/madwifi/patches/111-minstrel_crash.patch b/package/madwifi/patches/111-minstrel_crash.patch
index ec851859cc820ae8d8ccd16ff84bc5eeec4b2ac8..6fa388832daec4fb7e6489dd3957518bc5982648 100644 (file)
--- a/package/madwifi/patches/111-minstrel_crash.patch
+++ b/package/madwifi/patches/111-minstrel_crash.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c      2008-02-20 18:10:46.143143939 +0100
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c   2008-02-20 18:10:47.471219622 +0100
+--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
++++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
 @@ -393,6 +393,9 @@
                struct minstrel_node *sn = ATH_NODE_MINSTREL(an);
                int rc1, rc2, rc3;         /* Index into the rate table, so for example, it is  0..11 */

diff --git a/package/madwifi/patches/113-no_ibss_pwrsave.patch b/package/madwifi/patches/113-no_ibss_pwrsave.patch
index fb24b4f3859429accd6897227863dbb6ce13167a..44ee8fd588e8a20db6af90518e6f7c6aa4a3df0a 100644 (file)
--- a/package/madwifi/patches/113-no_ibss_pwrsave.patch
+++ b/package/madwifi/patches/113-no_ibss_pwrsave.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/net80211/ieee80211_scan.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_scan.c 2008-02-20 18:10:46.107141889 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_scan.c      2008-02-20 18:10:47.679231478 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_scan.c
++++ madwifi-trunk-r3314/net80211/ieee80211_scan.c
 @@ -291,7 +291,8 @@
        struct ieee80211com *ic = vap->iv_ic;
        int delay;

diff --git a/package/madwifi/patches/122-replayfail_workaround.patch b/package/madwifi/patches/122-replayfail_workaround.patch
index f1d497b3e1858ed1e96c43df302d075aa3e7a927..e694cac567f759b1f408a98a32284892e041c609 100644 (file)
--- a/package/madwifi/patches/122-replayfail_workaround.patch
+++ b/package/madwifi/patches/122-replayfail_workaround.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/net80211/ieee80211_linux.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.c        2008-02-20 18:10:46.075140065 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_linux.c     2008-02-20 18:10:47.887243331 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.c
++++ madwifi-trunk-r3314/net80211/ieee80211_linux.c
 @@ -331,6 +331,9 @@
                k->wk_cipher->ic_name, k->wk_keyix,
                (unsigned long long)rsc);

diff --git a/package/madwifi/patches/123-ccmp_checks.patch b/package/madwifi/patches/123-ccmp_checks.patch
index 7d80ba5bf34eaca09c9f62fc6857a33f473bdd43..d59ed5059e3b2aa5ca29d3ec177e286c66989a47 100644 (file)
--- a/package/madwifi/patches/123-ccmp_checks.patch
+++ b/package/madwifi/patches/123-ccmp_checks.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_ccmp.c  2008-02-20 18:10:46.043138240 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c       2008-02-20 18:10:48.095255184 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_ccmp.c
++++ madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c
 @@ -475,6 +475,9 @@
        uint8_t *mic, *pos;
        u_int space;

diff --git a/package/madwifi/patches/124-linux24_compat.patch b/package/madwifi/patches/124-linux24_compat.patch
index 5f0eacdb1a7d3ce8a70b89b78408c84c5dc961cd..5bde01bbeae2329e5a64a9a05e4969fc7dc3385a 100644 (file)
--- a/package/madwifi/patches/124-linux24_compat.patch
+++ b/package/madwifi/patches/124-linux24_compat.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath/if_athvar.h
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h   2008-02-20 18:10:45.991135277 +0100
-+++ madwifi-trunk-r3314/ath/if_athvar.h        2008-02-20 18:10:48.307267266 +0100
+--- madwifi-trunk-r3314.orig/ath/if_athvar.h
++++ madwifi-trunk-r3314/ath/if_athvar.h
 @@ -126,6 +126,11 @@
  #define ATH_GET_NETDEV_DEV(ndev)      ((ndev)->class_dev.dev)
  #endif
@@ -16,8 +16,8 @@ Index: madwifi-trunk-r3314/ath/if_athvar.h
                                               void (*setup)(struct net_device *))
 Index: madwifi-trunk-r3314/ath/if_ath_radar.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath_radar.c        2008-02-20 18:10:45.999135735 +0100
-+++ madwifi-trunk-r3314/ath/if_ath_radar.c     2008-02-20 18:10:48.307267266 +0100
+--- madwifi-trunk-r3314.orig/ath/if_ath_radar.c
++++ madwifi-trunk-r3314/ath/if_ath_radar.c
 @@ -92,6 +92,13 @@
  #define nofloat_pct(_value, _pct) \
        ( (_value * (1000 + _pct)) / 1000 )
@@ -34,8 +34,8 @@ Index: madwifi-trunk-r3314/ath/if_ath_radar.c
        const char *name;
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 18:10:47.047195460 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 18:10:48.315267722 +0100
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
 @@ -4705,6 +4705,46 @@
  #undef USE_SHPREAMBLE
  }
@@ -85,8 +85,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
   */
 Index: madwifi-trunk-r3314/net80211/sort.c
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ madwifi-trunk-r3314/net80211/sort.c        2008-02-20 18:10:48.319267951 +0100
+--- /dev/null
++++ madwifi-trunk-r3314/net80211/sort.c
 @@ -0,0 +1,120 @@
 +/*
 + * A fast, small, non-recursive O(nlog n) sort for the Linux kernel

diff --git a/package/madwifi/patches/126-rxerr_frames.patch b/package/madwifi/patches/126-rxerr_frames.patch
index d48ebea9781846beaefdc7fc07514e5850cc101f..5ee2a9d92c375e74954d0417ef3d8e4a559e6115 100644 (file)
--- a/package/madwifi/patches/126-rxerr_frames.patch
+++ b/package/madwifi/patches/126-rxerr_frames.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 18:10:48.315267722 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 18:10:48.567282084 +0100
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
 @@ -6474,8 +6474,9 @@
                        /*
                         * Reject error frames if we have no vaps that

diff --git a/package/madwifi/patches/200-no_debug.patch b/package/madwifi/patches/200-no_debug.patch
index 95c55c3a8838dbd1d233f219591c3c3b6bea63d4..3c440c0ae003269558eac08cc13f534e2a52cf77 100644 (file)
--- a/package/madwifi/patches/200-no_debug.patch
+++ b/package/madwifi/patches/200-no_debug.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-05-19 14:54:42.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-05-19 14:54:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
 @@ -42,7 +42,6 @@
   * This software is derived from work of Atsushi Onoe; his contribution
   * is greatly appreciated.
@@ -103,8 +103,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
   * necessary actions (such as a DFS reaction to radar). */
 Index: madwifi-trunk-r3314/ath_rate/amrr/amrr.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/amrr/amrr.c      2008-05-19 14:53:01.000000000 +0200
-+++ madwifi-trunk-r3314/ath_rate/amrr/amrr.c   2008-05-19 14:54:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath_rate/amrr/amrr.c
++++ madwifi-trunk-r3314/ath_rate/amrr/amrr.c
 @@ -70,7 +70,9 @@
  
  #include "amrr.h"
@@ -117,8 +117,8 @@ Index: madwifi-trunk-r3314/ath_rate/amrr/amrr.c
        if (sc->sc_debug & 0x10)                                        \
 Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c      2008-05-19 14:54:42.000000000 +0200
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c   2008-05-19 14:54:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
++++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
 @@ -117,7 +117,9 @@
  
  #include "minstrel.h"
@@ -131,8 +131,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
                ATH_DEBUG_RATE          = 0x00000010    /* rate control */
 Index: madwifi-trunk-r3314/ath_rate/onoe/onoe.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/onoe/onoe.c      2008-05-19 14:53:01.000000000 +0200
-+++ madwifi-trunk-r3314/ath_rate/onoe/onoe.c   2008-05-19 14:54:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath_rate/onoe/onoe.c
++++ madwifi-trunk-r3314/ath_rate/onoe/onoe.c
 @@ -66,7 +66,9 @@
  
  #include "onoe.h"
@@ -145,8 +145,8 @@ Index: madwifi-trunk-r3314/ath_rate/onoe/onoe.c
        ATH_DEBUG_RATE  = 0x00000010,   /* rate control */
 Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c  2008-05-19 14:53:01.000000000 +0200
-+++ madwifi-trunk-r3314/ath_rate/sample/sample.c       2008-05-19 14:54:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c
++++ madwifi-trunk-r3314/ath_rate/sample/sample.c
 @@ -68,7 +68,9 @@
  
  #include "sample.h"
@@ -160,8 +160,8 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
        ATH_DEBUG_RATE          = 0x00000010,   /* rate control */
 Index: madwifi-trunk-r3314/tools/do_multi.c
 ===================================================================
---- madwifi-trunk-r3314.orig/tools/do_multi.c  2008-05-19 14:53:01.000000000 +0200
-+++ madwifi-trunk-r3314/tools/do_multi.c       2008-05-19 14:54:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/tools/do_multi.c
++++ madwifi-trunk-r3314/tools/do_multi.c
 @@ -9,16 +9,20 @@
  
      progname = basename(argv[0]);
@@ -185,8 +185,8 @@ Index: madwifi-trunk-r3314/tools/do_multi.c
      if(strcmp(progname, "athstats") == 0)
 Index: madwifi-trunk-r3314/tools/Makefile
 ===================================================================
---- madwifi-trunk-r3314.orig/tools/Makefile    2008-05-19 14:54:31.000000000 +0200
-+++ madwifi-trunk-r3314/tools/Makefile 2008-05-19 14:55:14.000000000 +0200
+--- madwifi-trunk-r3314.orig/tools/Makefile
++++ madwifi-trunk-r3314/tools/Makefile
 @@ -48,6 +48,8 @@
  
  all: compile
@@ -207,8 +207,8 @@ Index: madwifi-trunk-r3314/tools/Makefile
  
 Index: madwifi-trunk-r3314/net80211/ieee80211_linux.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.h        2008-05-19 14:53:01.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_linux.h     2008-05-19 14:54:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.h
++++ madwifi-trunk-r3314/net80211/ieee80211_linux.h
 @@ -29,8 +29,6 @@
  #ifndef _NET80211_IEEE80211_LINUX_H_
  #define _NET80211_IEEE80211_LINUX_H_
@@ -220,8 +220,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_linux.h
  #include <linux/wireless.h>
 Index: madwifi-trunk-r3314/Makefile.inc
 ===================================================================
---- madwifi-trunk-r3314.orig/Makefile.inc      2008-05-19 14:53:01.000000000 +0200
-+++ madwifi-trunk-r3314/Makefile.inc   2008-05-19 14:54:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/Makefile.inc
++++ madwifi-trunk-r3314/Makefile.inc
 @@ -148,7 +148,8 @@
  TOOLS=  $(TOP)/tools 
  
@@ -234,8 +234,8 @@ Index: madwifi-trunk-r3314/Makefile.inc
  # TARGET defines the target platform architecture. It must match one of
 Index: madwifi-trunk-r3314/ath/if_ath_radar.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath_radar.c        2008-05-19 14:54:42.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath_radar.c     2008-05-19 14:54:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath/if_ath_radar.c
++++ madwifi-trunk-r3314/ath/if_ath_radar.c
 @@ -19,8 +19,6 @@
   * $Id: if_ath_radar.c 2464 2007-06-15 22:51:56Z mtaylor $
   */
@@ -256,8 +256,8 @@ Index: madwifi-trunk-r3314/ath/if_ath_radar.c
  
 Index: madwifi-trunk-r3314/ath/if_ath_hal.h
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath_hal.h  2008-05-19 14:53:01.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath_hal.h       2008-05-19 14:54:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath/if_ath_hal.h
++++ madwifi-trunk-r3314/ath/if_ath_hal.h
 @@ -1081,6 +1081,7 @@
  
             tail -f /var/log/messages | sed -f hal_unmangle.sed 
@@ -277,8 +277,8 @@ Index: madwifi-trunk-r3314/ath/if_ath_hal.h
  #endif                                /* #ifndef _IF_ATH_HAL_H_ */
 Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h  2008-05-19 14:53:01.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_var.h       2008-05-19 14:54:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h
++++ madwifi-trunk-r3314/net80211/ieee80211_var.h
 @@ -492,9 +492,10 @@
        /* inject a fake radar signal -- used while on a 802.11h DFS channels */
        unsigned int (*ic_test_radar)(struct ieee80211com *);
@@ -293,8 +293,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
        unsigned int (*ic_get_dfs_cac_time)(struct ieee80211com *);
 Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c     2008-05-19 14:53:01.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c  2008-05-19 14:54:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c
++++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
 @@ -1548,6 +1548,7 @@
        return 0;
  }
@@ -335,8 +335,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
        set_priv(IEEE80211_IOCTL_WDSADDMAC, ieee80211_ioctl_wdsmac),
 Index: madwifi-trunk-r3314/ath/if_ath_debug.h
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath_debug.h        2008-05-19 14:53:01.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath_debug.h     2008-05-19 14:54:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath/if_ath_debug.h
++++ madwifi-trunk-r3314/ath/if_ath_debug.h
 @@ -68,13 +68,6 @@
                ath_keyprint((_sc), __func__, _ix, _hk, _mac);          \
  } while (0)
@@ -369,8 +369,8 @@ Index: madwifi-trunk-r3314/ath/if_ath_debug.h
  #endif /* #ifndef _IF_ATH_DEBUG_H_ */
 Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c 2008-05-19 14:53:01.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_node.c      2008-05-19 14:54:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c
++++ madwifi-trunk-r3314/net80211/ieee80211_node.c
 @@ -920,6 +920,9 @@
        ni->ni_rxkeyoff = 0;
  }

diff --git a/package/madwifi/patches/201-debug_fix.patch b/package/madwifi/patches/201-debug_fix.patch
index 0059ecf7908295545ceed57d9310221d38f52d33..398a1d997424307755b07ac6c0f07669477e2459 100644 (file)
--- a/package/madwifi/patches/201-debug_fix.patch
+++ b/package/madwifi/patches/201-debug_fix.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath_hal/ah_os.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_hal/ah_os.c   2008-02-20 18:10:44.539052527 +0100
-+++ madwifi-trunk-r3314/ath_hal/ah_os.c        2008-02-20 18:10:55.159657761 +0100
+--- madwifi-trunk-r3314.orig/ath_hal/ah_os.c
++++ madwifi-trunk-r3314/ath_hal/ah_os.c
 @@ -65,7 +65,7 @@
  #include <ah_os.h>
  

diff --git a/package/madwifi/patches/300-napi_polling.patch b/package/madwifi/patches/300-napi_polling.patch
index 1cc95857c4f06508539b65e7bb9b036a3cbea1ff..081a9a41bdbfd2ec9cabeb207ee33316ae9baffc 100644 (file)
--- a/package/madwifi/patches/300-napi_polling.patch
+++ b/package/madwifi/patches/300-napi_polling.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-03-06 23:49:24.344018025 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-03-07 00:38:01.010996975 +0100
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
 @@ -184,7 +184,11 @@
        struct sk_buff *, int, int, u_int64_t);
  static void ath_setdefantenna(struct ath_softc *, u_int);
@@ -15,7 +15,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  static int ath_hardstart(struct sk_buff *, struct net_device *);
  static int ath_mgtstart(struct ieee80211com *, struct sk_buff *);
  #ifdef ATH_SUPERG_COMP
-@@ -374,6 +378,9 @@
+@@ -376,6 +380,9 @@
                u_int32_t new_clamped_maxtxpower);
  static u_int32_t ath_get_real_maxtxpower(struct ath_softc *sc);
  
@@ -25,7 +25,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  /* calibrate every 30 secs in steady state but check every second at first. */
  static int ath_calinterval = ATH_SHORT_CALINTERVAL;
  static int ath_countrycode = CTRY_DEFAULT;    /* country code */
-@@ -545,7 +552,6 @@
+@@ -547,7 +554,6 @@
  
        atomic_set(&sc->sc_txbuf_counter, 0);
  
@@ -33,7 +33,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        ATH_INIT_TQUEUE(&sc->sc_txtq,     ath_tx_tasklet,       dev);
        ATH_INIT_TQUEUE(&sc->sc_bmisstq,  ath_bmiss_tasklet,    dev);
        ATH_INIT_TQUEUE(&sc->sc_bstucktq, ath_bstuck_tasklet,   dev);
-@@ -819,6 +825,12 @@
+@@ -821,6 +827,12 @@
        dev->set_mac_address = ath_set_mac_address;
        dev->change_mtu = ath_change_mtu;
        dev->tx_queue_len = ATH_TXBUF - ATH_TXBUF_MGT_RESERVED;
@@ -46,7 +46,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  #ifdef USE_HEADERLEN_RESV
        dev->hard_header_len += sizeof(struct ieee80211_qosframe) +
                                sizeof(struct llc) +
-@@ -2213,6 +2225,7 @@
+@@ -2216,6 +2228,7 @@
                (status & HAL_INT_GLOBAL)       ? " HAL_INT_GLOBAL"     : ""
                );
  
@@ -54,7 +54,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        status &= sc->sc_imask;                 /* discard unasked for bits */
        /* As soon as we know we have a real interrupt we intend to service, 
         * we will check to see if we need an initial hardware TSF reading. 
-@@ -2270,7 +2283,23 @@
+@@ -2273,7 +2286,23 @@
                }
                if (status & (HAL_INT_RX | HAL_INT_RXPHY)) {
                        ath_uapsd_processtriggers(sc, hw_tsf);
@@ -79,7 +79,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                }
                if (status & HAL_INT_TX) {
  #ifdef ATH_SUPERG_DYNTURBO
-@@ -2296,6 +2325,11 @@
+@@ -2299,6 +2328,11 @@
                                }
                        }
  #endif
@@ -91,7 +91,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                        ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
                }
                if (status & HAL_INT_BMISS) {
-@@ -2508,6 +2542,7 @@
+@@ -2511,6 +2545,7 @@
        if (sc->sc_tx99 != NULL)
                sc->sc_tx99->start(sc->sc_tx99);
  #endif
@@ -99,7 +99,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
  done:
        ATH_UNLOCK(sc);
-@@ -2548,6 +2583,9 @@
+@@ -2551,6 +2586,9 @@
                if (sc->sc_tx99 != NULL)
                        sc->sc_tx99->stop(sc->sc_tx99);
  #endif
@@ -109,7 +109,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                netif_stop_queue(dev);  /* XXX re-enabled by ath_newstate */
                dev->flags &= ~IFF_RUNNING;     /* NB: avoid recursion */
                ieee80211_stop_running(ic);     /* stop all VAPs */
-@@ -4006,6 +4044,39 @@
+@@ -4009,6 +4047,39 @@
        return ath_keyset(sc, k, mac, vap->iv_bss);
  }
  
@@ -149,7 +149,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  /*
   * Block/unblock tx+rx processing while a key change is done.
   * We assume the caller serializes key management operations
-@@ -4023,13 +4094,7 @@
+@@ -4026,13 +4097,7 @@
         * When called from the rx tasklet we cannot use
         * tasklet_disable because it will block waiting
         * for us to complete execution.
@@ -163,7 +163,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        netif_stop_queue(dev);
  }
  
-@@ -4040,9 +4105,9 @@
+@@ -4043,9 +4108,9 @@
        struct ath_softc *sc = dev->priv;
  
        DPRINTF(sc, ATH_DEBUG_KEYCACHE, "End\n");
@@ -176,7 +176,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  }
  
  /*
-@@ -6347,15 +6412,25 @@
+@@ -6350,15 +6415,25 @@
        sc->sc_rxotherant = 0;
  }
  
@@ -206,7 +206,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        struct ieee80211com *ic = &sc->sc_ic;
        struct ath_hal *ah = sc ? sc->sc_ah : NULL;
        struct ath_desc *ds;
-@@ -6365,8 +6440,10 @@
+@@ -6368,8 +6443,10 @@
        unsigned int len;
        int type;
        u_int phyerr;
@@ -217,7 +217,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        do {
                bf = STAILQ_FIRST(&sc->sc_rxbuf);
                if (bf == NULL) {               /* XXX ??? can this happen */
-@@ -6390,6 +6467,15 @@
+@@ -6393,6 +6470,15 @@
                        /* NB: never process the self-linked entry at the end */
                        break;
                }
@@ -233,7 +233,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                skb = bf->bf_skb;
                if (skb == NULL) {
                        EPRINTF(sc, "Dropping; buffer contains NULL skbuff.\n");
-@@ -6437,6 +6523,7 @@
+@@ -6440,6 +6526,7 @@
                                sc->sc_stats.ast_rx_phyerr++;
                                phyerr = rs->rs_phyerr & 0x1f;
                                sc->sc_stats.ast_rx_phy[phyerr]++;
@@ -241,7 +241,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                        }
                        if (rs->rs_status & HAL_RXERR_DECRYPT) {
                                /*
-@@ -6632,9 +6719,43 @@
+@@ -6635,9 +6722,43 @@
                STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list);
                ATH_RXBUF_UNLOCK_IRQ(sc);
        } while (ath_rxbuf_init(sc, bf) == 0);
@@ -285,7 +285,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  #undef PA2DESC
  }
  
-@@ -8285,12 +8406,24 @@
+@@ -8288,12 +8409,24 @@
  {
        struct net_device *dev = (struct net_device *)data;
        struct ath_softc *sc = dev->priv;
@@ -310,7 +310,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
-@@ -8306,7 +8439,9 @@
+@@ -8309,7 +8442,9 @@
  {
        struct net_device *dev = (struct net_device *)data;
        struct ath_softc *sc = dev->priv;
@@ -320,7 +320,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        /*
         * Process each active queue.
         */
-@@ -8327,6 +8462,16 @@
+@@ -8330,6 +8465,16 @@
        if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum))
                ath_tx_processq(sc, sc->sc_uapsdq);
  
@@ -337,7 +337,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
-@@ -8342,13 +8487,25 @@
+@@ -8345,13 +8490,25 @@
        struct net_device *dev = (struct net_device *)data;
        struct ath_softc *sc = dev->priv;
        unsigned int i;
@@ -363,7 +363,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
-@@ -10281,9 +10439,9 @@
+@@ -10284,9 +10441,9 @@
        dev->mtu = mtu;
        if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) {
                /* NB: the rx buffers may need to be reallocated */
@@ -377,8 +377,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
 Index: madwifi-trunk-r3314/ath/if_athvar.h
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h   2008-03-06 23:49:24.296015306 +0100
-+++ madwifi-trunk-r3314/ath/if_athvar.h        2008-03-07 00:34:32.792958008 +0100
+--- madwifi-trunk-r3314.orig/ath/if_athvar.h
++++ madwifi-trunk-r3314/ath/if_athvar.h
 @@ -53,6 +53,10 @@
  # include     <asm/bitops.h>
  #endif
@@ -427,8 +427,8 @@ Index: madwifi-trunk-r3314/ath/if_athvar.h
  #define       ATH_RXBUF_LOCK_DESTROY(_sc)
 Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c        2008-03-06 23:49:11.027259154 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c     2008-03-07 00:34:41.589459294 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
++++ madwifi-trunk-r3314/net80211/ieee80211_input.c
 @@ -1198,7 +1198,7 @@
                        /* attach vlan tag */
                        struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni;
@@ -462,8 +462,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
                                /* node reference was leaked */
 Index: madwifi-trunk-r3314/net80211/ieee80211_monitor.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_monitor.c      2008-03-06 23:49:11.031259383 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_monitor.c   2008-03-07 00:33:59.235045655 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_monitor.c
++++ madwifi-trunk-r3314/net80211/ieee80211_monitor.c
 @@ -584,8 +584,8 @@
                        skb1->protocol = 
                                __constant_htons(0x0019); /* ETH_P_80211_RAW */
@@ -477,8 +477,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_monitor.c
                                if (SKB_CB(skb1)->ni != NULL)
 Index: madwifi-trunk-r3314/net80211/ieee80211_skb.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_skb.c  2008-03-06 23:49:11.039259840 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_skb.c       2008-03-06 23:49:24.384020316 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_skb.c
++++ madwifi-trunk-r3314/net80211/ieee80211_skb.c
 @@ -73,7 +73,7 @@
  #undef dev_queue_xmit
  #undef kfree_skb
@@ -510,8 +510,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_skb.c
  EXPORT_SYMBOL(skb_clone_debug);
 Index: madwifi-trunk-r3314/net80211/ieee80211_skb.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_skb.h  2008-03-06 23:49:11.047260294 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_skb.h       2008-03-06 23:49:24.384020316 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_skb.h
++++ madwifi-trunk-r3314/net80211/ieee80211_skb.h
 @@ -116,7 +116,7 @@
  int  vlan_hwaccel_receive_skb_debug(struct sk_buff *skb, 
                                    struct vlan_group *grp, unsigned short vlan_tag, 

diff --git a/package/madwifi/patches/305-pureg_fix.patch b/package/madwifi/patches/305-pureg_fix.patch
index c278cf2c3ce3656aeb35d83d56cb771968973868..8154cbd94345e87f43b20fe31201510c95849e82 100644 (file)
--- a/package/madwifi/patches/305-pureg_fix.patch
+++ b/package/madwifi/patches/305-pureg_fix.patch
@@ -1,8 +1,8 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 21:57:41.025078273 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 21:57:44.393270217 +0100
-@@ -4146,7 +4146,9 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
+@@ -4149,7 +4149,9 @@
                rfilt |= HAL_RX_FILTER_PROM;
        if (ic->ic_opmode == IEEE80211_M_STA ||
            sc->sc_opmode == HAL_M_IBSS ||      /* NB: AHDEMO too */
@@ -15,8 +15,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
 Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c        2008-02-20 21:57:41.037078957 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c     2008-02-20 21:57:44.401270672 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
++++ madwifi-trunk-r3314/net80211/ieee80211_input.c
 @@ -346,11 +346,12 @@
                                bssid = wh->i_addr3;
                        }
@@ -110,8 +110,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
                 */
 Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c 2008-02-20 21:56:33.629237604 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_node.c      2008-02-20 21:57:44.409271127 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c
++++ madwifi-trunk-r3314/net80211/ieee80211_node.c
 @@ -383,10 +383,16 @@
        /* Update country ie information */
        ieee80211_build_countryie(ic);
@@ -133,8 +133,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
  }
 Index: madwifi-trunk-r3314/net80211/ieee80211_proto.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_proto.c        2008-02-20 21:56:33.633237829 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_proto.c     2008-02-20 21:57:44.413271357 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_proto.c
++++ madwifi-trunk-r3314/net80211/ieee80211_proto.c
 @@ -595,6 +595,28 @@
        { 4, { 2, 4, 11, 22 } },        /* IEEE80211_MODE_TURBO_G (mixed b/g) */
  };
@@ -166,9 +166,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_proto.c
   * specified mode.  For 11b compatibility we mark only 11b
 Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h  2008-02-20 21:56:33.645238517 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_var.h       2008-02-20 21:57:44.417271583 +0100
-@@ -707,6 +707,7 @@
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h
++++ madwifi-trunk-r3314/net80211/ieee80211_var.h
+@@ -708,6 +708,7 @@
  void ieee80211_build_sc_ie(struct ieee80211com *);
  void ieee80211_dfs_action(struct ieee80211com *);
  void ieee80211_expire_channel_excl_restrictions(struct ieee80211com *);

diff --git a/package/madwifi/patches/309-micfail_detect.patch b/package/madwifi/patches/309-micfail_detect.patch
index 3923f2be8282838ce9a60b4cbf0cabb2aeeae5a6..3a5d1be9a8e0fa95b2c52ff7f92a437855f29b87 100644 (file)
--- a/package/madwifi/patches/309-micfail_detect.patch
+++ b/package/madwifi/patches/309-micfail_detect.patch
@@ -1,8 +1,8 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 21:55:41.314256342 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 21:56:10.819937775 +0100
-@@ -6443,6 +6443,7 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
+@@ -6446,6 +6446,7 @@
        int type;
        u_int phyerr;
        u_int processed = 0, early_stop = 0;
@@ -10,7 +10,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
        DPRINTF(sc, ATH_DEBUG_RX_PROC, "invoked\n");
  process_rx_again:
-@@ -6544,24 +6545,8 @@
+@@ -6547,24 +6548,8 @@
                        }
                        if (rs->rs_status & HAL_RXERR_MIC) {
                                sc->sc_stats.ast_rx_badmic++;
@@ -37,7 +37,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                        }
                        /*
                         * Reject error frames if we have no vaps that
-@@ -6600,8 +6585,9 @@
+@@ -6603,8 +6588,9 @@
                /*
                 * Finished monitor mode handling, now reject
                 * error frames before passing to other vaps
@@ -48,7 +48,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                        ieee80211_dev_kfree_skb(&skb);
                        goto rx_next;
                }
-@@ -6609,6 +6595,26 @@
+@@ -6612,6 +6598,26 @@
                /* remove the CRC */
                skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
  
@@ -75,7 +75,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                /*
                 * From this point on we assume the frame is at least
                 * as large as ieee80211_frame_min; verify that.
-@@ -6621,6 +6627,7 @@
+@@ -6624,6 +6630,7 @@
                        goto rx_next;
                }
  
@@ -85,8 +85,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                 */
 Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_ccmp.c  2008-02-20 21:52:06.822033125 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c       2008-02-20 21:55:45.302483625 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_ccmp.c
++++ madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c
 @@ -73,7 +73,7 @@
  static int ccmp_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int ccmp_decap(struct ieee80211_key *, struct sk_buff *, int);
@@ -107,8 +107,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c
  }
 Index: madwifi-trunk-r3314/net80211/ieee80211_crypto.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto.h       2008-02-20 21:50:40.149093918 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_crypto.h    2008-02-20 21:55:45.310484070 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto.h
++++ madwifi-trunk-r3314/net80211/ieee80211_crypto.h
 @@ -145,7 +145,7 @@
        int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t);
        int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int);
@@ -133,8 +133,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto.h
  /*
 Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_none.c  2008-02-20 21:50:40.153094148 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c       2008-02-20 21:55:45.314484297 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_none.c
++++ madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c
 @@ -52,7 +52,7 @@
  static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int none_decap(struct ieee80211_key *, struct sk_buff *, int);
@@ -155,8 +155,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c
  
 Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_tkip.c  2008-02-20 21:50:40.161094600 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c       2008-02-20 21:55:45.314484297 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_tkip.c
++++ madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c
 @@ -57,7 +57,7 @@
  static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int tkip_enmic(struct ieee80211_key *, struct sk_buff *, int);
@@ -186,8 +186,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c
                u8 mic0[IEEE80211_WEP_MICLEN];
 Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_wep.c   2008-02-20 21:50:40.169095058 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c        2008-02-20 21:55:45.314484297 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_wep.c
++++ madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c
 @@ -54,7 +54,7 @@
  static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int wep_decap(struct ieee80211_key *, struct sk_buff *, int);
@@ -208,8 +208,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c
  }
 Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c        2008-02-20 21:55:41.318256570 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c     2008-02-20 21:55:45.318484528 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
++++ madwifi-trunk-r3314/net80211/ieee80211_input.c
 @@ -669,7 +669,7 @@
                 * Next strip any MSDU crypto bits.
                 */
@@ -269,8 +269,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
   * Debugging support.
 Index: madwifi-trunk-r3314/net80211/ieee80211_proto.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_proto.h        2008-02-20 21:50:40.185095969 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_proto.h     2008-02-20 21:55:45.318484528 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_proto.h
++++ madwifi-trunk-r3314/net80211/ieee80211_proto.h
 @@ -90,6 +90,7 @@
  void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
  enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
@@ -281,8 +281,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_proto.h
   * Return the size of the 802.11 header for a management or data frame.
 Index: madwifi-trunk-r3314/net80211/ieee80211_linux.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.c        2008-02-20 21:52:06.810032443 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_linux.c     2008-02-20 21:55:45.318484528 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.c
++++ madwifi-trunk-r3314/net80211/ieee80211_linux.c
 @@ -337,8 +337,8 @@
        /* TODO: needed parameters: count, keyid, key type, src address, TSC */
        snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=" MAC_FMT ")", tag,
@@ -296,8 +296,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_linux.c
        wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
 Index: madwifi-trunk-r3314/net80211/ieee80211_output.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_output.c       2008-02-20 21:50:40.197096654 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_output.c    2008-02-20 21:55:45.326484992 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_output.c
++++ madwifi-trunk-r3314/net80211/ieee80211_output.c
 @@ -1074,13 +1074,16 @@
                        cip = (struct ieee80211_cipher *) key->wk_cipher;
                        ciphdrsize = cip->ic_header;
@@ -320,9 +320,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_output.c
                 * Allocate sk_buff for each subsequent fragment; First fragment
 Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c 2008-02-20 21:55:41.318256570 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_node.c      2008-02-20 21:55:45.326484992 +0100
-@@ -2261,11 +2261,13 @@
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c
++++ madwifi-trunk-r3314/net80211/ieee80211_node.c
+@@ -2264,11 +2264,13 @@
        /* From this point onwards we can no longer find the node,
         * so no more references are generated
         */

diff --git a/package/madwifi/patches/310-noise_get.patch b/package/madwifi/patches/310-noise_get.patch
index 512b959621d91b3accaa7e5151682acb7667f123..841305ee7c10c86ac039f9670fc7901080a483fe 100644 (file)
--- a/package/madwifi/patches/310-noise_get.patch
+++ b/package/madwifi/patches/310-noise_get.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-03-07 01:53:50.021034889 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-03-07 01:54:31.203381737 +0100
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
 @@ -1695,8 +1695,6 @@
         * get to reality.  This value is used in monitor mode and by tools like
         * Wireshark and Kismet.
@@ -11,7 +11,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        ATH_RXBUF_LOCK_IRQ(sc);
        if (sc->sc_rxbufcur == NULL)
                sc->sc_rxbufcur = STAILQ_FIRST(&sc->sc_rxbuf);
-@@ -8967,6 +8965,7 @@
+@@ -8966,6 +8964,7 @@
                        sc->sc_curchan.channel);
                sc->sc_stats.ast_per_calfail++;
        }
@@ -19,7 +19,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
        ath_hal_process_noisefloor(ah);
        if (isIQdone == AH_TRUE) {
-@@ -9035,6 +9034,7 @@
+@@ -9034,6 +9033,7 @@
        struct ath_softc *sc = dev->priv;
  
        (void) ath_chan_set(sc, ic->ic_curchan);
@@ -27,7 +27,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        /*
         * If we are returning to our bss channel then mark state
         * so the next recv'd beacon's TSF will be used to sync the
-@@ -9303,6 +9303,7 @@
+@@ -9302,6 +9302,7 @@
                }
  
                ath_hal_process_noisefloor(ah);
@@ -37,8 +37,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                 */
 Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c     2008-03-07 01:53:48.708960118 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c  2008-03-07 01:54:31.211382196 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c
++++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
 @@ -4358,6 +4358,7 @@
        si->isi_state = ni->ni_flags;
        si->isi_authmode = ni->ni_authmode;
@@ -49,8 +49,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
        si->isi_erp = ni->ni_erp;
 Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h        2008-03-07 01:53:48.440944845 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h     2008-03-07 01:54:31.211382196 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h
++++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
 @@ -311,6 +311,7 @@
        u_int16_t isi_state;            /* state flags */
        u_int8_t isi_authmode;          /* authentication algorithm */

diff --git a/package/madwifi/patches/311-bssid_alloc.patch b/package/madwifi/patches/311-bssid_alloc.patch
index 48b2f290f72c9351296287f2f1c2da187262262a..fc515456f1084bdcf821164b1b129e17a9a80b11 100644 (file)
--- a/package/madwifi/patches/311-bssid_alloc.patch
+++ b/package/madwifi/patches/311-bssid_alloc.patch
@@ -1,8 +1,8 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 21:57:55.057877957 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 21:57:58.494073773 +0100
-@@ -1351,7 +1351,7 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
+@@ -1354,7 +1354,7 @@
                TAILQ_FOREACH(v, &ic->ic_vaps, iv_next)
                        id_mask |= (1 << ATH_GET_VAP_ID(v->iv_myaddr));
  

diff --git a/package/madwifi/patches/312-erpupdate.patch b/package/madwifi/patches/312-erpupdate.patch
index 158911bf3c80619a51ecf6de5ef480e8b2c5e126..2af36af264cc3ca6a0a535a6d4b8d31bc75dc772 100644 (file)
--- a/package/madwifi/patches/312-erpupdate.patch
+++ b/package/madwifi/patches/312-erpupdate.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/net80211/ieee80211_beacon.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_beacon.c       2008-02-20 18:10:45.515108151 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_beacon.c    2008-02-20 18:10:50.491391734 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_beacon.c
++++ madwifi-trunk-r3314/net80211/ieee80211_beacon.c
 @@ -542,10 +542,10 @@
                        vap->iv_flags &= ~IEEE80211_F_XRUPDATE;
                }
@@ -17,8 +17,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_beacon.c
        /* if it is a mode change beacon for dynamic turbo case */
 Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c        2008-02-20 18:10:49.723347963 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c     2008-02-20 18:10:50.495391960 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
++++ madwifi-trunk-r3314/net80211/ieee80211_input.c
 @@ -3431,9 +3431,12 @@
                        /* Assume no ERP IE == 11b AP */
                        if ((!has_erp || (has_erp && (scan.erp & IEEE80211_ERP_NON_ERP_PRESENT))) &&
@@ -35,9 +35,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
  
 Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c 2008-02-20 18:10:49.727348192 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_node.c      2008-02-20 18:10:50.507392644 +0100
-@@ -2022,8 +2022,12 @@
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c
++++ madwifi-trunk-r3314/net80211/ieee80211_node.c
+@@ -2025,8 +2025,12 @@
                }
  
                /* Update ERP element if this is first non ERP station */
@@ -52,7 +52,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
        } else
                ni->ni_flags |= IEEE80211_NODE_ERP;
  }
-@@ -2226,6 +2230,8 @@
+@@ -2229,6 +2233,8 @@
                IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni,
                        "non-ERP station leaves, count now %d", ic->ic_nonerpsta);
                if (ic->ic_nonerpsta == 0) {
@@ -61,7 +61,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
                        IEEE80211_DPRINTF(vap, IEEE80211_MSG_ASSOC,
                                "%s: disable use of protection\n", __func__);
                        ic->ic_flags &= ~IEEE80211_F_USEPROT;
-@@ -2237,7 +2243,9 @@
+@@ -2240,7 +2246,9 @@
                                ic->ic_flags |= IEEE80211_F_SHPREAMBLE;
                                ic->ic_flags &= ~IEEE80211_F_USEBARKER;
                        }

diff --git a/package/madwifi/patches/317-bmask.patch b/package/madwifi/patches/317-bmask.patch
index 39095ebefcd2d171f38c320245e87d0c9c132d26..9d55c3e9ec52be0f79adedca9cfe3848a21e8e14 100644 (file)
--- a/package/madwifi/patches/317-bmask.patch
+++ b/package/madwifi/patches/317-bmask.patch
@@ -1,8 +1,8 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 21:57:58.494073773 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 21:58:14.318975583 +0100
-@@ -8673,6 +8673,10 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
+@@ -8680,6 +8680,10 @@
  
        sc->sc_rxbufcur = NULL;
  

diff --git a/package/madwifi/patches/323-dfs_optional.patch b/package/madwifi/patches/323-dfs_optional.patch
index ca19e648c5707e82c9b082589527940e6cf952ac..e5116ce9c53cfd90121eddbe06d895b23507e713 100644 (file)
--- a/package/madwifi/patches/323-dfs_optional.patch
+++ b/package/madwifi/patches/323-dfs_optional.patch
@@ -1,8 +1,8 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 21:58:51.885116355 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 21:58:53.697219623 +0100
-@@ -1771,17 +1771,14 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
+@@ -1774,17 +1774,14 @@
                         * may have occurred in the intervening timeframe. */
                        bf->bf_channoise = ic->ic_channoise;
  
@@ -29,9 +29,9 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                        bus_dma_sync_single(sc->sc_bdev, bf->bf_skbaddr,
 Index: madwifi-trunk-r3314/ath/if_ath_radar.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath_radar.c        2008-02-20 21:58:35.060157557 +0100
-+++ madwifi-trunk-r3314/ath/if_ath_radar.c     2008-02-20 21:58:53.701219858 +0100
-@@ -263,7 +263,7 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath_radar.c
++++ madwifi-trunk-r3314/ath/if_ath_radar.c
+@@ -261,7 +261,7 @@
                unsigned int new_rxfilt = old_rxfilt;
  
                ath_hal_intrset(ah, old_ier & ~HAL_INT_GLOBAL);

diff --git a/package/madwifi/patches/324-alignment.patch b/package/madwifi/patches/324-alignment.patch
index f90fa4f981c4ed6b62286ae24c1715d579048c15..52be8ae7f76fe823cc1e8a2a19524ceecce7535a 100644 (file)
--- a/package/madwifi/patches/324-alignment.patch
+++ b/package/madwifi/patches/324-alignment.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c        2008-02-20 18:10:50.495391960 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c     2008-02-20 18:10:51.395443250 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
++++ madwifi-trunk-r3314/net80211/ieee80211_input.c
 @@ -1275,14 +1275,8 @@
                eh->ether_type = ether_type;
  

diff --git a/package/madwifi/patches/325-channel_spam.patch b/package/madwifi/patches/325-channel_spam.patch
index e3318fff4892b335f739ae9dbb1a2357d16828df..1f326ef3839673324d2cd6e9929ffc25aae0d749 100644 (file)
--- a/package/madwifi/patches/325-channel_spam.patch
+++ b/package/madwifi/patches/325-channel_spam.patch
@@ -1,8 +1,8 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 21:58:53.697219623 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 21:58:58.545495909 +0100
-@@ -9776,7 +9776,9 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
+@@ -9783,7 +9783,9 @@
        /*
         * Convert HAL channels to ieee80211 ones.
         */
@@ -12,7 +12,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        for (i = 0; i < nchan; i++) {
                HAL_CHANNEL *c = &chans[i];
                struct ieee80211_channel *ichan = &ic->ic_channels[i];
-@@ -9803,6 +9805,7 @@
+@@ -9810,6 +9812,7 @@
                ic->ic_chan_non_occupy[i].tv_sec  = 0;
                ic->ic_chan_non_occupy[i].tv_usec = 0;
  
@@ -20,7 +20,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                IPRINTF(sc, "Channel %3d (%4d MHz) Max Tx Power %d dBm%s "
                                "[%d hw %d reg] Flags%s%s%s%s%s%s%s%s%s%s%s%s%"
                                "s%s%s%s%s%s%s%s%s%s%s%s\n",
-@@ -9891,6 +9894,7 @@
+@@ -9898,6 +9901,7 @@
                                (c->privFlags & 0x0080 ? 
                                 " PF & (1 << 7)" : "")
                                );

diff --git a/package/madwifi/patches/327-queue.patch b/package/madwifi/patches/327-queue.patch
index 5c8850dcb405b54af339a0fb1eba38f4185d5858..5210bf9364f95607b378ac1584e25b00bcbcff1b 100644 (file)
--- a/package/madwifi/patches/327-queue.patch
+++ b/package/madwifi/patches/327-queue.patch
@@ -1,8 +1,8 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 21:58:58.545495909 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 21:59:01.609670527 +0100
-@@ -8423,8 +8423,6 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
+@@ -8431,8 +8431,6 @@
        ath_hal_intrset(sc->sc_ah, sc->sc_imask);
        local_irq_restore(flags);
  
@@ -11,7 +11,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        if (sc->sc_softled)
                ath_led_event(sc, ATH_LED_TX);
  }
-@@ -8471,8 +8469,6 @@
+@@ -8479,8 +8477,6 @@
        ath_hal_intrset(sc->sc_ah, sc->sc_imask);
        local_irq_restore(flags);
  
@@ -20,7 +20,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        if (sc->sc_softled)
                ath_led_event(sc, ATH_LED_TX);
  }
-@@ -8505,8 +8501,6 @@
+@@ -8513,8 +8509,6 @@
        ath_hal_intrset(sc->sc_ah, sc->sc_imask);
        local_irq_restore(flags);
  
@@ -31,8 +31,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  }
 Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c        2008-02-20 21:58:57.425432087 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c     2008-02-20 21:59:01.613670756 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
++++ madwifi-trunk-r3314/net80211/ieee80211_input.c
 @@ -1132,7 +1132,7 @@
            (vap->iv_flags & IEEE80211_F_NOBRIDGE) == 0) {
                struct sk_buff *skb1 = NULL;

diff --git a/package/madwifi/patches/330-beaconcal.patch b/package/madwifi/patches/330-beaconcal.patch
index fe4f9724f98dbf63c28453aee35f5cc1b8ded8d9..a1c299d1d1ea0481c3e5e6efb9b3a8b0dc307ce2 100644 (file)
--- a/package/madwifi/patches/330-beaconcal.patch
+++ b/package/madwifi/patches/330-beaconcal.patch
@@ -1,8 +1,8 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 21:59:04.037808900 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 21:59:07.426001981 +0100
-@@ -395,6 +395,7 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
+@@ -397,6 +397,7 @@
  static int maxvaps = -1;
  static int outdoor = -1;
  static int xchanmode = -1;
@@ -10,7 +10,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
  static const char *hal_status_desc[] = {
        "No error",
-@@ -420,6 +421,7 @@
+@@ -422,6 +423,7 @@
  };
  
  #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52))
@@ -18,7 +18,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  MODULE_PARM(countrycode, "i");
  MODULE_PARM(maxvaps, "i");
  MODULE_PARM(outdoor, "i");
-@@ -432,6 +434,7 @@
+@@ -434,6 +436,7 @@
  MODULE_PARM(ratectl, "s");
  #else
  #include <linux/moduleparam.h>
@@ -26,7 +26,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  module_param(countrycode, int, 0600);
  module_param(maxvaps, int, 0600);
  module_param(outdoor, int, 0600);
-@@ -2595,7 +2598,8 @@
+@@ -2598,7 +2601,8 @@
                }
                if (!sc->sc_invalid) {
                        del_timer_sync(&sc->sc_dfs_cac_timer);
@@ -36,7 +36,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                }
                ath_draintxq(sc);
                if (!sc->sc_invalid) {
-@@ -2612,6 +2616,20 @@
+@@ -2615,6 +2619,20 @@
        return 0;
  }
  
@@ -57,7 +57,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  /*
   * Stop the device, grabbing the top-level lock to protect
   * against concurrent entry through ath_init (which can happen
-@@ -2737,6 +2755,12 @@
+@@ -2740,6 +2758,12 @@
        HAL_STATUS status;
  
        /*
@@ -70,7 +70,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
         * Convert to a HAL channel description with the flags
         * constrained to reflect the current operating mode.
         */
-@@ -5142,6 +5166,8 @@
+@@ -5145,6 +5169,8 @@
                        "Invoking ath_hal_txstart with sc_bhalq: %d\n",
                        sc->sc_bhalq);
                ath_hal_txstart(ah, sc->sc_bhalq);
@@ -79,7 +79,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
                sc->sc_stats.ast_be_xmit++;             /* XXX per-VAP? */
        }
-@@ -5391,6 +5417,7 @@
+@@ -5394,6 +5420,7 @@
                ath_hal_beacontimers(ah, &bs);
                sc->sc_imask |= HAL_INT_BMISS;
                ath_hal_intrset(ah, sc->sc_imask);
@@ -87,7 +87,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        } else {
                ath_hal_intrset(ah, 0);
                if (reset_tsf)
-@@ -5402,8 +5429,11 @@
+@@ -5405,8 +5432,11 @@
                         */
                        intval |= HAL_BEACON_ENA;
                        sc->sc_imask |= HAL_INT_SWBA;
@@ -100,7 +100,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  #ifdef ATH_SUPERG_DYNTURBO
                ath_beacon_dturbo_config(vap, intval &
                                ~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA));
-@@ -8864,6 +8894,9 @@
+@@ -8870,6 +8900,9 @@
                        /* Enter DFS wait period */
                        mod_timer(&sc->sc_dfs_cac_timer,
                                jiffies + (sc->sc_dfs_cac_period * HZ));
@@ -110,7 +110,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                }
                /*
                 * re configure beacons when it is a turbo mode switch.
-@@ -8973,8 +9006,11 @@
+@@ -8979,8 +9012,11 @@
                sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
                isIQdone ? "done" : "not done");
  
@@ -124,7 +124,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  }
  
  static void
-@@ -9081,7 +9117,8 @@
+@@ -9087,7 +9123,8 @@
                ieee80211_state_name[vap->iv_state],
                ieee80211_state_name[nstate]);
  
@@ -134,7 +134,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
        ath_hal_setledstate(ah, leds[nstate]);  /* set LED */
        netif_stop_queue(dev);                  /* before we do anything else */
-@@ -9306,7 +9343,8 @@
+@@ -9312,7 +9349,8 @@
                                "VAP -> DFSWAIT_PENDING \n");
                        /* start calibration timer with a really small value 
                         * 1/10 sec */
@@ -144,7 +144,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                        /* wake the receiver */
                        netif_wake_queue(dev);
                        /* don't do the other usual stuff... */
-@@ -9349,7 +9387,7 @@
+@@ -9355,7 +9393,7 @@
        error = avp->av_newstate(vap, nstate, arg);
  
        /* Finally, start any timers. */
@@ -155,8 +155,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        }
 Index: madwifi-trunk-r3314/ath/if_athvar.h
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h   2008-02-20 21:58:38.148333545 +0100
-+++ madwifi-trunk-r3314/ath/if_athvar.h        2008-02-20 21:59:07.426001981 +0100
+--- madwifi-trunk-r3314.orig/ath/if_athvar.h
++++ madwifi-trunk-r3314/ath/if_athvar.h
 @@ -778,6 +778,8 @@
        struct ieee80211vap **sc_bslot;         /* beacon xmit slots */
        int sc_bnext;                           /* next slot for beacon xmit */

diff --git a/package/madwifi/patches/331-memory_alloc.patch b/package/madwifi/patches/331-memory_alloc.patch
index e5509c2cc288527d12a8b8ddf10f857ba64bec39..ae78681a7d0d2a8b5d06f092a1c2e68191efa917 100644 (file)
--- a/package/madwifi/patches/331-memory_alloc.patch
+++ b/package/madwifi/patches/331-memory_alloc.patch
@@ -1,8 +1,8 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 18:10:52.499506168 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 18:10:52.731519391 +0100
-@@ -3315,17 +3315,18 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
+@@ -3318,17 +3318,18 @@
         * without affecting any other bridge ports. */
        if (skb_cloned(skb)) {
                /* Remember the original SKB so we can free up our references */
@@ -27,7 +27,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        eh = (struct ether_header *)skb->data;
  
  #ifdef ATH_SUPERG_FF
-@@ -3596,6 +3597,8 @@
+@@ -3599,6 +3600,8 @@
        sc->sc_stats.ast_tx_mgmt++;
        return 0;
  bad:

diff --git a/package/madwifi/patches/332-reset_beacons.patch b/package/madwifi/patches/332-reset_beacons.patch
index a982c1df053b21f5bd7f6c7a8610c4be85a684a1..a2ce279db36fd90284c6659d22065806ea8f0f05 100644 (file)
--- a/package/madwifi/patches/332-reset_beacons.patch
+++ b/package/madwifi/patches/332-reset_beacons.patch
@@ -1,8 +1,8 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 22:22:50.203268987 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 22:23:25.745294410 +0100
-@@ -8905,7 +8915,7 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
+@@ -8911,7 +8911,7 @@
                 * re configure beacons when it is a turbo mode switch.
                 * HW seems to turn off beacons during turbo mode switch.
                 */
@@ -11,4 +11,3 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                        ath_beacon_config(sc, NULL);
                /*
                 * Re-enable interrupts.
-

diff --git a/package/madwifi/patches/333-apscan_mode.patch b/package/madwifi/patches/333-apscan_mode.patch
index 75a89fcfa1b2a8b1b870ced0d3bfdca4c5e278e2..e2ffb698d4258b7a271ccccd9f57af6bbe044d5c 100644 (file)
--- a/package/madwifi/patches/333-apscan_mode.patch
+++ b/package/madwifi/patches/333-apscan_mode.patch
@@ -1,8 +1,8 @@
 Index: madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_scan_ap.c      2008-02-21 02:42:12.885287851 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c   2008-02-21 02:42:34.718532055 +0100
-@@ -781,12 +783,6 @@
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_scan_ap.c
++++ madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c
+@@ -781,12 +781,6 @@
                                /* break the loop as the subsequent chans won't be 
                                 * better */
                                break;
@@ -15,4 +15,3 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c
                }
  
                if (sta_assoc != 0) {
-

diff --git a/package/madwifi/patches/334-input.patch b/package/madwifi/patches/334-input.patch
index 365662a3cc8982dad875d57a62619916e32b2877..462839e83f7d09e13abb789f942c84b1c967208f 100644 (file)
--- a/package/madwifi/patches/334-input.patch
+++ b/package/madwifi/patches/334-input.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c        2008-02-29 01:31:47.601395974 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c     2008-02-29 01:35:46.545089077 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
++++ madwifi-trunk-r3314/net80211/ieee80211_input.c
 @@ -950,6 +950,9 @@
        TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
                struct sk_buff *skb1;

diff --git a/package/madwifi/patches/340-maxrate.patch b/package/madwifi/patches/340-maxrate.patch
index ab093f7265c2aa8a5fe68c17d57c89d5163976b3..1d9f4c6547bba9ee2938b7f4ead2fe2f0f8410b2 100644 (file)
--- a/package/madwifi/patches/340-maxrate.patch
+++ b/package/madwifi/patches/340-maxrate.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-03-07 02:30:44.403857478 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-03-07 02:30:53.276363092 +0100
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
 @@ -1307,6 +1307,7 @@
        vap->iv_key_set = ath_key_set;
        vap->iv_key_update_begin = ath_key_update_begin;
@@ -12,8 +12,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                 * use those (only). */
 Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c      2008-03-07 02:30:44.275850185 +0100
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c   2008-03-07 02:30:53.276363092 +0100
+--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
++++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
 @@ -622,8 +622,12 @@
                        return;
                }
@@ -30,8 +30,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
                        sn->rs_thisprob         [x] = 0;
 Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c  2008-03-07 02:30:44.055837647 +0100
-+++ madwifi-trunk-r3314/ath_rate/sample/sample.c       2008-03-07 02:30:53.280363321 +0100
+--- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c
++++ madwifi-trunk-r3314/ath_rate/sample/sample.c
 @@ -835,7 +835,12 @@
        }
        sn->static_rate_ndx = -1;
@@ -48,8 +48,8 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
                sn->rates[x].rix = sc->sc_rixmap[sn->rates[x].rate];
 Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h        2008-03-07 02:30:44.211846539 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h     2008-03-07 02:30:53.284363550 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h
++++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
 @@ -641,6 +641,7 @@
                                                           FCC requires 30m, so that is the default. */
        IEEE80211_PARAM_BEACON_MISS_THRESH      = 73,   /* Beacon miss threshold (in beacons) */
@@ -60,8 +60,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
  #define       SIOCG80211STATS                 (SIOCDEVPRIVATE+2)
 Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h  2008-03-07 02:30:44.155843346 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_var.h       2008-03-07 02:31:48.563513730 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h
++++ madwifi-trunk-r3314/net80211/ieee80211_var.h
 @@ -281,6 +281,7 @@
        struct ieee80211_spy iv_spy;                    /* IWSPY support */
        struct ieee80211_app_ie app_ie[IEEE80211_APPIE_NUM_OF_FRAME]; /* app-specified IEs by frame type */
@@ -72,8 +72,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
  /* Debug functions need the defintion of struct ieee80211vap because iv_debug 
 Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c     2008-03-07 02:30:44.211846539 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c  2008-03-07 02:30:53.292364006 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c
++++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
 @@ -2839,6 +2839,12 @@
                else
                        ic->ic_flags_ext &= ~IEEE80211_FEXT_MARKDFS;

diff --git a/package/madwifi/patches/341-minrate.patch b/package/madwifi/patches/341-minrate.patch
index 1d5628c6a9d680adfc42697cf1b8eea975141bf9..37d09cafa219035878af3032b9dc30b7de49195e 100644 (file)
--- a/package/madwifi/patches/341-minrate.patch
+++ b/package/madwifi/patches/341-minrate.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-03-07 02:30:53.276363092 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-03-07 02:32:12.584882631 +0100
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
 @@ -1308,6 +1308,7 @@
        vap->iv_key_update_begin = ath_key_update_begin;
        vap->iv_key_update_end = ath_key_update_end;
@@ -12,8 +12,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                 * use those (only). */
 Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c      2008-03-07 02:30:53.276363092 +0100
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c   2008-03-07 02:32:12.584882631 +0100
+--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
++++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
 @@ -638,9 +638,15 @@
                        sn->rs_succ_hist        [x] = 0;
                        sn->rs_att_hist         [x] = 0;
@@ -42,8 +42,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
                ath_fill_sample_table(sn);
 Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c  2008-03-07 02:30:53.280363321 +0100
-+++ madwifi-trunk-r3314/ath_rate/sample/sample.c       2008-03-07 02:32:12.596883312 +0100
+--- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c
++++ madwifi-trunk-r3314/ath_rate/sample/sample.c
 @@ -842,8 +842,15 @@
                sn->num_rates = vap->iv_maxrateindex;
  
@@ -64,8 +64,8 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
                                dev_info, __func__, x);
 Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h        2008-03-07 02:30:53.284363550 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h     2008-03-07 02:32:12.600883541 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h
++++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
 @@ -642,6 +642,7 @@
        IEEE80211_PARAM_BEACON_MISS_THRESH      = 73,   /* Beacon miss threshold (in beacons) */
        IEEE80211_PARAM_BEACON_MISS_THRESH_MS   = 74,   /* Beacon miss threshold (in ms) */
@@ -76,8 +76,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
  #define       SIOCG80211STATS                 (SIOCDEVPRIVATE+2)
 Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h  2008-03-07 02:31:48.563513730 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_var.h       2008-03-07 02:32:12.604883771 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h
++++ madwifi-trunk-r3314/net80211/ieee80211_var.h
 @@ -282,6 +282,7 @@
        struct ieee80211_app_ie app_ie[IEEE80211_APPIE_NUM_OF_FRAME]; /* app-specified IEs by frame type */
        u_int32_t app_filter;                           /* filters which management frames are forwarded to app */
@@ -88,8 +88,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
  /* Debug functions need the defintion of struct ieee80211vap because iv_debug 
 Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c     2008-03-07 02:30:53.292364006 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c  2008-03-07 02:32:12.604883771 +0100
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c
++++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
 @@ -2845,6 +2845,12 @@
                else
                        vap->iv_maxrateindex = 0;

diff --git a/package/madwifi/patches/342-performance.patch b/package/madwifi/patches/342-performance.patch
index 54b30ac0058bf3499bfb3ab4ba6cb4ebd7ea3a01..2252c972c60cb1d83fe093393bf63c597db17cb4 100644 (file)
--- a/package/madwifi/patches/342-performance.patch
+++ b/package/madwifi/patches/342-performance.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-06-01 02:04:25.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-06-01 02:04:25.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
 @@ -3237,7 +3237,6 @@
        struct ath_softc *sc = dev->priv;
        struct ieee80211_node *ni = NULL;
@@ -48,8 +48,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        ATH_TXQ_LOCK_IRQ(txq);
 Index: madwifi-trunk-r3314/net80211/ieee80211_output.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_output.c       2008-06-01 02:04:24.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_output.c    2008-06-01 02:04:25.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_output.c
++++ madwifi-trunk-r3314/net80211/ieee80211_output.c
 @@ -283,7 +283,7 @@
         * normal vap. */
        if (vap->iv_xrvap && (ni == vap->iv_bss) &&
@@ -218,8 +218,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_output.c
  #define       KEY_UNDEFINED(k)        ((k).wk_cipher == &ieee80211_cipher_none)
 Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c        2008-06-01 02:04:25.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c     2008-06-01 02:04:33.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
++++ madwifi-trunk-r3314/net80211/ieee80211_input.c
 @@ -204,7 +204,6 @@
        struct ieee80211_frame *wh;
        struct ieee80211_key *key;

diff --git a/package/madwifi/patches/343-txqueue_races.patch b/package/madwifi/patches/343-txqueue_races.patch
index be6b488d47e97d037c59279e96d5a86b4921391f..afbf115c04098913c982ec22b72f949815a2d72b 100644 (file)
--- a/package/madwifi/patches/343-txqueue_races.patch
+++ b/package/madwifi/patches/343-txqueue_races.patch
@@ -2,9 +2,9 @@ Merged from madwifi trunk r3551, r3552
 
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-04-20 23:18:52.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-04-20 23:20:36.000000000 +0200
-@@ -8245,6 +8245,17 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
+@@ -8244,6 +8244,17 @@
                        goto bf_fail;
                }
  
@@ -24,8 +24,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
 Index: madwifi-trunk-r3314/ath/if_athvar.h
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h   2008-04-20 23:18:48.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_athvar.h        2008-04-20 23:21:12.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath/if_athvar.h
++++ madwifi-trunk-r3314/ath/if_athvar.h
 @@ -586,7 +586,8 @@
  } while (0)
  #define ATH_TXQ_REMOVE_HEAD(_tq, _field) do { \

diff --git a/package/madwifi/patches/344-minstrel_failcnt.patch b/package/madwifi/patches/344-minstrel_failcnt.patch
index b588aec0c35ee12f847d0926cf80e317ae89d56a..e2cedcb38de5ca36b5b4be5a6311c8d99fb166c6 100644 (file)
--- a/package/madwifi/patches/344-minstrel_failcnt.patch
+++ b/package/madwifi/patches/344-minstrel_failcnt.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c      2008-04-21 00:51:15.000000000 +0200
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c   2008-04-21 02:41:27.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
++++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
 @@ -475,7 +475,7 @@
                /* 'tries' is the total number of times we have endeavoured to
                 * send this packet, and is a sum of the #attempts at each

diff --git a/package/madwifi/patches/345-minstrel_sampling.patch b/package/madwifi/patches/345-minstrel_sampling.patch
index 3be5a8fee3fb22ddf44a315d3ebe0476a012ee12..0d4ee9f0ac1b901895096def54d39bb1e6d30e04 100644 (file)
--- a/package/madwifi/patches/345-minstrel_sampling.patch
+++ b/package/madwifi/patches/345-minstrel_sampling.patch
@@ -1,8 +1,8 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-04-21 09:13:19.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-04-23 01:15:49.000000000 +0200
-@@ -8095,6 +8095,7 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
+@@ -8094,6 +8094,7 @@
                ath_hal_setupxtxdesc(sc->sc_ah, ds, mrr.rate1, mrr.retries1,
                                     mrr.rate2, mrr.retries2,
                                     mrr.rate3, mrr.retries3);
@@ -12,8 +12,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  #ifndef ATH_SUPERG_FF
 Index: madwifi-trunk-r3314/ath/if_athvar.h
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h   2008-04-21 09:13:19.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_athvar.h        2008-04-23 01:15:49.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath/if_athvar.h
++++ madwifi-trunk-r3314/ath/if_athvar.h
 @@ -446,6 +446,7 @@
        u_int16_t bf_flags;                             /* tx descriptor flags */
        u_int64_t bf_tsf;
@@ -24,8 +24,8 @@ Index: madwifi-trunk-r3314/ath/if_athvar.h
         *      multiple segments.
 Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c      2008-04-21 09:13:19.000000000 +0200
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c   2008-04-23 01:15:50.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
++++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
 @@ -333,15 +333,19 @@
                if (sn->static_rate_ndx >= 0) {
                            ndx = sn->static_rate_ndx;
@@ -76,8 +76,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
                tries = tries - tries1;
 Index: madwifi-trunk-r3314/net80211/ieee80211_rate.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_rate.h 2008-04-21 09:11:19.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_rate.h      2008-04-21 09:13:19.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_rate.h
++++ madwifi-trunk-r3314/net80211/ieee80211_rate.h
 @@ -87,6 +87,7 @@
        int retries2;
        int rate3;

diff --git a/package/madwifi/patches/346-protmode_trig.patch b/package/madwifi/patches/346-protmode_trig.patch
index 136f6e5e82537572a37f1c8059d3efe00f97eb7c..8aba2d60e736c6daffb2cb484a5d395b2d1005ab 100644 (file)
--- a/package/madwifi/patches/346-protmode_trig.patch
+++ b/package/madwifi/patches/346-protmode_trig.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/net80211/ieee80211.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211.c      2008-04-23 04:33:06.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211.c   2008-04-23 04:33:17.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211.c
++++ madwifi-trunk-r3314/net80211/ieee80211.c
 @@ -333,7 +333,9 @@
                        IEEE80211_MS_TO_TU(IEEE80211_BMISSTHRESH_DEFAULT_MS), 
                        ic->ic_lintval), ic->ic_lintval);
@@ -15,9 +15,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211.c
        TAILQ_INIT(&ic->ic_vaps);
 Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c        2008-04-23 04:33:17.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c     2008-04-23 05:28:00.000000000 +0200
-@@ -3412,14 +3412,18 @@
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
++++ madwifi-trunk-r3314/net80211/ieee80211_input.c
+@@ -3411,14 +3411,18 @@
                        IEEE80211_IS_CHAN_ANYG(ic->ic_curchan)) {
  
                        /* Assume no ERP IE == 11b AP */
@@ -43,8 +43,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
  
 Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h        2008-04-23 04:33:17.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h     2008-04-23 04:33:17.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h
++++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
 @@ -643,6 +643,8 @@
        IEEE80211_PARAM_BEACON_MISS_THRESH_MS   = 74,   /* Beacon miss threshold (in ms) */
        IEEE80211_PARAM_MAXRATE                 = 75,   /* Maximum rate (by table index) */
@@ -56,8 +56,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
  #define       SIOCG80211STATS                 (SIOCDEVPRIVATE+2)
 Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h  2008-04-23 04:33:17.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_var.h       2008-04-23 04:33:17.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h
++++ madwifi-trunk-r3314/net80211/ieee80211_var.h
 @@ -128,6 +128,9 @@
  
  #define       IEEE80211_APPIE_MAX     1024
@@ -80,8 +80,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
         *
 Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c     2008-04-23 04:33:17.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c  2008-04-23 04:33:17.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c
++++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
 @@ -2312,6 +2312,12 @@
                    IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan))
                        retv = ENETRESET;
@@ -125,8 +125,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
        { IEEE80211_PARAM_MCASTCIPHER,
 Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c 2008-04-23 04:33:16.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_node.c      2008-04-23 05:28:47.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c
++++ madwifi-trunk-r3314/net80211/ieee80211_node.c
 @@ -1877,6 +1877,17 @@
  
        ieee80211_scan_timeout(ic);

diff --git a/package/madwifi/patches/347-tuning.patch b/package/madwifi/patches/347-tuning.patch
index b2e4661fdd98be714e5a5c63d9f9357c77758432..50a56d7966ff3313ab11ae88317d92eb2cbb8a2f 100644 (file)
--- a/package/madwifi/patches/347-tuning.patch
+++ b/package/madwifi/patches/347-tuning.patch
@@ -1,8 +1,8 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-04-23 03:31:06.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-04-23 03:31:23.000000000 +0200
-@@ -10267,11 +10267,11 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
+@@ -10265,11 +10265,11 @@
        sc->sc_currates = rt;
        sc->sc_curmode = mode;
        /*
@@ -19,8 +19,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  }
 Index: madwifi-trunk-r3314/ath/if_athvar.h
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h   2008-04-23 03:31:23.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_athvar.h        2008-04-23 03:31:23.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath/if_athvar.h
++++ madwifi-trunk-r3314/ath/if_athvar.h
 @@ -272,6 +272,10 @@
  #define AES_ICV_FIELD_SIZE      8       /* AES ICV field size */
  #define EXT_IV_FIELD_SIZE       4       /* ext IV field size */
@@ -34,8 +34,8 @@ Index: madwifi-trunk-r3314/ath/if_athvar.h
  #define XR_DEFAULT_GRPPOLL_RATE_STR   "0.25 1 1 3 3 6 6 20"
 Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c      2008-04-23 03:31:01.000000000 +0200
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c   2008-04-23 03:31:23.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
++++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
 @@ -197,7 +197,7 @@
                unsigned int x = 0, tt = 0;
                unsigned int cix = rt->info[rix].controlRate;
@@ -56,8 +56,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
                return tt;
 Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.h
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.h      2008-04-23 03:31:01.000000000 +0200
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.h   2008-04-23 03:31:23.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.h
++++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.h
 @@ -180,14 +180,6 @@
  #define MAX(a,b)        ((a) > (b) ? (a) : (b))
  #endif
@@ -75,8 +75,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.h
   * a 5212 h/w descriptor. These Don't belong here; the
 Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c  2008-04-23 03:31:01.000000000 +0200
-+++ madwifi-trunk-r3314/ath_rate/sample/sample.c       2008-04-23 03:31:23.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c
++++ madwifi-trunk-r3314/ath_rate/sample/sample.c
 @@ -170,7 +170,7 @@
        struct ieee80211com *ic = &sc->sc_ic;
        unsigned int tt = 0;
@@ -97,8 +97,8 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
        return tt;
 Index: madwifi-trunk-r3314/ath_rate/sample/sample.h
 ===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/sample/sample.h  2008-04-23 03:31:01.000000000 +0200
-+++ madwifi-trunk-r3314/ath_rate/sample/sample.h       2008-04-23 03:31:23.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath_rate/sample/sample.h
++++ madwifi-trunk-r3314/ath_rate/sample/sample.h
 @@ -106,9 +106,6 @@
  #define MAX(a,b)        ((a) > (b) ? (a) : (b))
  #endif

diff --git a/package/madwifi/patches/348-ackcts.patch b/package/madwifi/patches/348-ackcts.patch
index 7fe85a89c59bb59aaa0e06c35d6ca316a95002e2..65db2a058b6ea104e239fbc2593a575bca953672 100644 (file)
--- a/package/madwifi/patches/348-ackcts.patch
+++ b/package/madwifi/patches/348-ackcts.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-04-23 06:50:24.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-04-23 06:54:03.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
 @@ -2721,6 +2721,9 @@
  static int
  ath_set_ack_bitrate(struct ath_softc *sc, int high)
@@ -12,7 +12,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        if (ar_device(sc->devid) == 5212 || ar_device(sc->devid) == 5213) {
                /* set ack to be sent at low bit-rate */
                /* registers taken from the OpenBSD 5212 HAL */
-@@ -10782,8 +10785,13 @@
+@@ -10780,8 +10783,13 @@
                                break;
  #endif
                        case ATH_ACKRATE:
@@ -30,8 +30,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                                ath_rp_record(sc,
 Index: madwifi-trunk-r3314/ath/if_athvar.h
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h   2008-04-23 05:41:40.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_athvar.h        2008-04-23 06:53:03.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath/if_athvar.h
++++ madwifi-trunk-r3314/ath/if_athvar.h
 @@ -681,6 +681,7 @@
        unsigned int    sc_devstopped:1;        /* stopped due to of no tx bufs */
        unsigned int    sc_stagbeacons:1;       /* use staggered beacons */

diff --git a/package/madwifi/patches/349-reset.patch b/package/madwifi/patches/349-reset.patch
index 9c8014055c23888604849d2a5ab3fa53a78322a1..f52f0b0384069f28853e775da7dfcb5fe95f266e 100644 (file)
--- a/package/madwifi/patches/349-reset.patch
+++ b/package/madwifi/patches/349-reset.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-04-09 02:58:41.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-04-09 02:59:40.000000000 +0200
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
 @@ -2479,7 +2479,7 @@
         */
        sc->sc_curchan.channel = ic->ic_curchan->ic_freq;
@@ -11,7 +11,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                EPRINTF(sc, "unable to reset hardware: '%s' (HAL status %u) "
                        "(freq %u flags 0x%x)\n", 
                        ath_get_hal_status_desc(status), status,
-@@ -8865,8 +8865,7 @@
+@@ -8853,8 +8853,7 @@
                 * needed to do the reset with chanchange = AH_FALSE in order
                 * to receive traffic when peforming high velocity channel
                 * changes. */

diff --git a/package/madwifi/patches/350-wisoc_softled.patch b/package/madwifi/patches/350-wisoc_softled.patch
index d22ee60924ecff5697e61fd1c620e13472177e0f..19658b91ecb64972f44eb03d30397916c5f34cc4 100644 (file)
--- a/package/madwifi/patches/350-wisoc_softled.patch
+++ b/package/madwifi/patches/350-wisoc_softled.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/ath/if_ath_ahb.c
 ===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath_ahb.c  2008-03-07 11:40:44.967178082 +0100
-+++ madwifi-trunk-r3314/ath/if_ath_ahb.c       2008-03-07 11:40:47.763337418 +0100
+--- madwifi-trunk-r3314.orig/ath/if_ath_ahb.c
++++ madwifi-trunk-r3314/ath/if_ath_ahb.c
 @@ -245,6 +245,8 @@
        num_activesc++;
        /* Ready to process interrupts */

diff --git a/package/madwifi/patches/351-scanlist.patch b/package/madwifi/patches/351-scanlist.patch
index 87ef5a97c41401c64a83777de775c2cf9a082c08..f45180a750edb71fe6b8ffda7ab5871878b4958e 100644 (file)
--- a/package/madwifi/patches/351-scanlist.patch
+++ b/package/madwifi/patches/351-scanlist.patch
@@ -1,7 +1,7 @@
 Index: madwifi-trunk-r3314/net80211/ieee80211_scan_sta.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_scan_sta.c     2008-06-01 03:41:58.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_scan_sta.c  2008-06-01 03:42:18.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_scan_sta.c
++++ madwifi-trunk-r3314/net80211/ieee80211_scan_sta.c
 @@ -317,147 +317,6 @@
  #undef ISPROBE
  }
@@ -343,8 +343,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_scan_sta.c
        .scan_end               = adhoc_pick_bss,
 Index: madwifi-trunk-r3314/net80211/ieee80211.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211.c      2008-06-01 03:41:58.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211.c   2008-06-01 03:42:18.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211.c
++++ madwifi-trunk-r3314/net80211/ieee80211.c
 @@ -278,6 +278,11 @@
                        ("channel with bogus ieee number %u", c->ic_ieee));
                setbit(ic->ic_chan_avail, c->ic_ieee);
@@ -359,8 +359,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211.c
                        ic->ic_modecaps |= 1 << IEEE80211_MODE_11A;
 Index: madwifi-trunk-r3314/net80211/_ieee80211.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/_ieee80211.h     2008-06-01 03:41:58.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/_ieee80211.h  2008-06-01 03:42:18.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/_ieee80211.h
++++ madwifi-trunk-r3314/net80211/_ieee80211.h
 @@ -132,6 +132,11 @@
        IEEE80211_SCAN_FIRST    = 2,    /* take first suitable candidate */
  };
@@ -383,8 +383,8 @@ Index: madwifi-trunk-r3314/net80211/_ieee80211.h
  #define       IEEE80211_CHAN_MAX      255
 Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h        2008-06-01 03:41:58.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h     2008-06-01 03:42:18.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h
++++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
 @@ -555,6 +555,7 @@
  #define       IEEE80211_IOCTL_WDSADDMAC       (SIOCIWFIRSTPRIV+26)
  #define       IEEE80211_IOCTL_WDSDELMAC       (SIOCIWFIRSTPRIV+28)
@@ -395,8 +395,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
        IEEE80211_WMMPARAMS_CWMIN       = 1,
 Index: madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_scan_ap.c      2008-06-01 03:41:58.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c   2008-06-01 03:42:18.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_scan_ap.c
++++ madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c
 @@ -129,131 +129,7 @@
  
  static int ap_flush(struct ieee80211_scan_state *);
@@ -666,8 +666,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c
                                as->as_required_mode)
 Index: madwifi-trunk-r3314/net80211/ieee80211_scan.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_scan.c 2008-06-01 03:41:58.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_scan.c      2008-06-01 03:42:18.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_scan.c
++++ madwifi-trunk-r3314/net80211/ieee80211_scan.c
 @@ -958,6 +958,79 @@
        }
  }
@@ -750,8 +750,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_scan.c
   * signal is detected.  AP mode only.  Return 1 on success, 0 on
 Index: madwifi-trunk-r3314/net80211/ieee80211_scan.h
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_scan.h 2008-06-01 03:41:58.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_scan.h      2008-06-01 03:42:18.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_scan.h
++++ madwifi-trunk-r3314/net80211/ieee80211_scan.h
 @@ -219,4 +219,7 @@
  void ieee80211_scanner_unregister(enum ieee80211_opmode,
        const struct ieee80211_scanner *);
@@ -762,8 +762,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_scan.h
  #endif /* _NET80211_IEEE80211_SCAN_H_ */
 Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
 ===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c     2008-06-01 03:41:58.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c  2008-06-01 03:42:53.000000000 +0200
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c
++++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
 @@ -3873,6 +3873,106 @@
        return ieee80211_ioctl_setmlme(dev, info, w, (char *)&mlme);
  }