Changeset 10511


Ignore:
Timestamp:
2008-02-20T22:26:21+01:00 (8 years ago)
Author:
nbd
Message:

refresh madwifi patches, fix an issue with napi polling (thx SeG)

Location:
trunk/package/madwifi/patches
Files:
1 deleted
26 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/madwifi/patches/100-kernel_cflags.patch

    r10198 r10511  
    1 Index: madwifi-dfs-r3053/hal/public/mips-be-elf.inc 
     1Index: madwifi-trunk-r3314/hal/public/mips-be-elf.inc 
    22=================================================================== 
    3 --- madwifi-dfs-r3053.orig/hal/public/mips-be-elf.inc   2007-12-13 05:25:10.890246068 +0100 
    4 +++ madwifi-dfs-r3053/hal/public/mips-be-elf.inc        2007-12-13 05:25:10.986251538 +0100 
     3--- madwifi-trunk-r3314.orig/hal/public/mips-be-elf.inc 2008-02-20 18:10:46.339155111 +0100 
     4+++ madwifi-trunk-r3314/hal/public/mips-be-elf.inc      2008-02-20 18:10:46.439160810 +0100 
    55@@ -71,5 +71,5 @@ 
    66  
     
    1010+COPTS+=        -G 0 -mno-abicalls -fno-pic -mips32 -Wa,--trap \ 
    1111        -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls 
    12 Index: madwifi-dfs-r3053/hal/public/mips-le-elf.inc 
     12Index: madwifi-trunk-r3314/hal/public/mips-le-elf.inc 
    1313=================================================================== 
    14 --- madwifi-dfs-r3053.orig/hal/public/mips-le-elf.inc   2007-12-13 05:25:10.898246523 +0100 
    15 +++ madwifi-dfs-r3053/hal/public/mips-le-elf.inc        2007-12-13 05:25:10.994251993 +0100 
     14--- madwifi-trunk-r3314.orig/hal/public/mips-le-elf.inc 2008-02-20 18:10:46.347155567 +0100 
     15+++ madwifi-trunk-r3314/hal/public/mips-le-elf.inc      2008-02-20 18:10:46.443161036 +0100 
    1616@@ -68,5 +68,5 @@ 
    1717  
     
    2121+COPTS+=        -G 0 -mno-abicalls -fno-pic -mips32 -Wa,--trap \ 
    2222        -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls 
    23 Index: madwifi-dfs-r3053/hal/public/xscale-be-elf.inc 
     23Index: madwifi-trunk-r3314/hal/public/xscale-be-elf.inc 
    2424=================================================================== 
    25 --- madwifi-dfs-r3053.orig/hal/public/xscale-be-elf.inc 2007-12-13 05:25:10.906246979 +0100 
    26 +++ madwifi-dfs-r3053/hal/public/xscale-be-elf.inc      2007-12-13 05:25:10.998252222 +0100 
     25--- madwifi-trunk-r3314.orig/hal/public/xscale-be-elf.inc       2008-02-20 18:10:46.351155793 +0100 
     26+++ madwifi-trunk-r3314/hal/public/xscale-be-elf.inc    2008-02-20 18:10:46.451161492 +0100 
    2727@@ -77,5 +77,5 @@ 
    2828  
     
    3232+COPTS+= -march=armv5te -mbig-endian -fno-strict-aliasing -fno-common  \ 
    3333        -mtune=xscale  -mshort-load-bytes 
    34 Index: madwifi-dfs-r3053/hal/public/xscale-le-elf.inc 
     34Index: madwifi-trunk-r3314/hal/public/xscale-le-elf.inc 
    3535=================================================================== 
    36 --- madwifi-dfs-r3053.orig/hal/public/xscale-le-elf.inc 2007-12-12 22:20:33.000000000 -0600 
    37 +++ madwifi-dfs-r3053/hal/public/xscale-le-elf.inc      2008-01-14 17:24:29.000000000 -0600 
    38 @@ -78,5 +78,5 @@ 
    39   
     36--- madwifi-trunk-r3314.orig/hal/public/xscale-le-elf.inc       2008-02-20 18:10:46.363156477 +0100 
     37+++ madwifi-trunk-r3314/hal/public/xscale-le-elf.inc    2008-02-20 18:10:46.455161721 +0100 
     38@@ -79,4 +79,4 @@ 
    4039 LDOPTS=        -EL 
    4140 COPTS+=        -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN 
    42 -COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \ 
     41 COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \ 
    4342-       -mapcs-32 -mtune=xscale  -mshort-load-bytes 
    44 +COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \ 
    4543+       -mtune=xscale  -mshort-load-bytes 
  • trunk/package/madwifi/patches/102-multicall_binary.patch

    r9719 r10511  
    1 Index: madwifi-dfs-r3053/tools/80211debug.c 
    2 =================================================================== 
    3 --- madwifi-dfs-r3053.orig/tools/80211debug.c   2007-12-13 05:25:10.786240140 +0100 
    4 +++ madwifi-dfs-r3053/tools/80211debug.c        2007-12-13 05:25:11.226265215 +0100 
     1Index: madwifi-trunk-r3314/tools/80211debug.c 
     2=================================================================== 
     3--- madwifi-trunk-r3314.orig/tools/80211debug.c 2008-02-20 18:10:46.235149183 +0100 
     4+++ madwifi-trunk-r3314/tools/80211debug.c      2008-02-20 18:10:46.695175398 +0100 
    55@@ -49,6 +49,10 @@ 
    66 #include <getopt.h> 
     
    3434        const char *cp, *tp; 
    3535        const char *sep; 
    36 Index: madwifi-dfs-r3053/tools/80211stats.c 
    37 =================================================================== 
    38 --- madwifi-dfs-r3053.orig/tools/80211stats.c   2007-12-13 05:25:10.794240595 +0100 
    39 +++ madwifi-dfs-r3053/tools/80211stats.c        2007-12-13 05:25:11.226265215 +0100 
     36Index: madwifi-trunk-r3314/tools/80211stats.c 
     37=================================================================== 
     38--- madwifi-trunk-r3314.orig/tools/80211stats.c 2008-02-20 18:10:46.243149638 +0100 
     39+++ madwifi-trunk-r3314/tools/80211stats.c      2008-02-20 18:10:46.695175398 +0100 
    4040@@ -60,6 +60,10 @@ 
    4141 #include "net80211/ieee80211_crypto.h" 
     
    6969        struct ieee80211req_sta_info *si; 
    7070        u_int8_t buf[24*1024], *cp; 
    71 Index: madwifi-dfs-r3053/tools/athchans.c 
    72 =================================================================== 
    73 --- madwifi-dfs-r3053.orig/tools/athchans.c     2007-12-13 05:25:10.798240825 +0100 
    74 +++ madwifi-dfs-r3053/tools/athchans.c  2007-12-13 05:25:11.238265900 +0100 
     71Index: madwifi-trunk-r3314/tools/athchans.c 
     72=================================================================== 
     73--- madwifi-trunk-r3314.orig/tools/athchans.c   2008-02-20 18:10:46.247149868 +0100 
     74+++ madwifi-trunk-r3314/tools/athchans.c        2008-02-20 18:10:46.703175854 +0100 
    7575@@ -59,6 +59,10 @@ 
    7676 #include "net80211/ieee80211_crypto.h" 
     
    8484 static const char *progname; 
    8585  
    86 @@ -139,9 +143,20 @@ 
     86@@ -140,9 +144,20 @@ 
    8787 } 
    8888  
     
    105105        struct ieee80211req_chanlist chanlist; 
    106106        int c; 
    107 Index: madwifi-dfs-r3053/tools/athctrl.c 
    108 =================================================================== 
    109 --- madwifi-dfs-r3053.orig/tools/athctrl.c      2007-12-13 05:25:10.806241280 +0100 
    110 +++ madwifi-dfs-r3053/tools/athctrl.c   2007-12-13 05:25:11.242266126 +0100 
     107Index: madwifi-trunk-r3314/tools/athctrl.c 
     108=================================================================== 
     109--- madwifi-trunk-r3314.orig/tools/athctrl.c    2008-02-20 18:10:46.255150323 +0100 
     110+++ madwifi-trunk-r3314/tools/athctrl.c 2008-02-20 18:10:46.707176083 +0100 
    111111@@ -53,6 +53,10 @@ 
    112112  
     
    140140        int distance = -1; 
    141141        int c; 
    142 Index: madwifi-dfs-r3053/tools/athdebug.c 
    143 =================================================================== 
    144 --- madwifi-dfs-r3053.orig/tools/athdebug.c     2007-12-13 05:25:10.814241735 +0100 
    145 +++ madwifi-dfs-r3053/tools/athdebug.c  2007-12-13 05:25:11.242266126 +0100 
     142Index: madwifi-trunk-r3314/tools/athdebug.c 
     143=================================================================== 
     144--- madwifi-trunk-r3314.orig/tools/athdebug.c   2008-02-20 18:10:46.263150778 +0100 
     145+++ madwifi-trunk-r3314/tools/athdebug.c        2008-02-20 18:10:46.711176309 +0100 
    146146@@ -52,6 +52,10 @@ 
    147147 #include <getopt.h> 
     
    176176        const char *ifname = "wifi0"; 
    177177 #else 
    178 Index: madwifi-dfs-r3053/tools/athkey.c 
    179 =================================================================== 
    180 --- madwifi-dfs-r3053.orig/tools/athkey.c       2007-12-13 05:25:10.818241964 +0100 
    181 +++ madwifi-dfs-r3053/tools/athkey.c    2007-12-13 05:25:11.242266126 +0100 
     178Index: madwifi-trunk-r3314/tools/athkey.c 
     179=================================================================== 
     180--- madwifi-trunk-r3314.orig/tools/athkey.c     2008-02-20 18:10:46.271151234 +0100 
     181+++ madwifi-trunk-r3314/tools/athkey.c  2008-02-20 18:10:46.711176309 +0100 
    182182@@ -59,6 +59,10 @@ 
    183183 #include "net80211/ieee80211_crypto.h" 
     
    191191 static const char *progname; 
    192192  
    193 @@ -212,9 +216,19 @@ 
     193@@ -213,9 +217,19 @@ 
    194194        exit(-1); 
    195195 } 
     
    211211        struct ieee80211req_key setkey; 
    212212        struct ieee80211req_del_key delkey; 
    213 Index: madwifi-dfs-r3053/tools/athstats.c 
    214 =================================================================== 
    215 --- madwifi-dfs-r3053.orig/tools/athstats.c     2007-12-13 05:25:10.826242419 +0100 
    216 +++ madwifi-dfs-r3053/tools/athstats.c  2007-12-13 05:25:11.242266126 +0100 
     213Index: madwifi-trunk-r3314/tools/athstats.c 
     214=================================================================== 
     215--- madwifi-trunk-r3314.orig/tools/athstats.c   2008-02-20 18:10:46.275151463 +0100 
     216+++ madwifi-trunk-r3314/tools/athstats.c        2008-02-20 18:10:46.711176309 +0100 
    217217@@ -66,6 +66,10 @@ 
    218218 #undef ARRAY_SIZE 
     
    247247        const char *ifname = "wifi0"; 
    248248 #else 
    249 Index: madwifi-dfs-r3053/tools/do_multi.c 
     249Index: madwifi-trunk-r3314/tools/do_multi.c 
    250250=================================================================== 
    251251--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    252 +++ madwifi-dfs-r3053/tools/do_multi.c  2007-12-13 05:25:11.242266126 +0100 
     252+++ madwifi-trunk-r3314/tools/do_multi.c        2008-02-20 18:10:46.711176309 +0100 
    253253@@ -0,0 +1,32 @@ 
    254254+#include <string.h> 
     
    284284+    return ret; 
    285285+} 
    286 Index: madwifi-dfs-r3053/tools/do_multi.h 
     286Index: madwifi-trunk-r3314/tools/do_multi.h 
    287287=================================================================== 
    288288--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    289 +++ madwifi-dfs-r3053/tools/do_multi.h  2007-12-13 05:25:11.246266355 +0100 
     289+++ madwifi-trunk-r3314/tools/do_multi.h        2008-02-20 18:10:46.711176309 +0100 
    290290@@ -0,0 +1,10 @@ 
    291291+ 
     
    299299+int wlanconfig_init(int argc, char *argv[]); 
    300300+int athinfo_init(int argc, char *argv[]); 
    301 Index: madwifi-dfs-r3053/tools/Makefile 
    302 =================================================================== 
    303 --- madwifi-dfs-r3053.orig/tools/Makefile       2007-12-13 05:25:10.842243330 +0100 
    304 +++ madwifi-dfs-r3053/tools/Makefile    2007-12-13 05:25:11.246266355 +0100 
     301Index: madwifi-trunk-r3314/tools/Makefile 
     302=================================================================== 
     303--- madwifi-trunk-r3314.orig/tools/Makefile     2008-02-20 18:10:46.295152602 +0100 
     304+++ madwifi-trunk-r3314/tools/Makefile  2008-02-20 18:10:46.715176538 +0100 
    305305@@ -47,9 +47,12 @@ 
    306306 endif 
     
    368368 install: $(ALL)  
    369369        install -d $(DESTDIR)$(BINDIR) 
    370 Index: madwifi-dfs-r3053/tools/wlanconfig.c 
    371 =================================================================== 
    372 --- madwifi-dfs-r3053.orig/tools/wlanconfig.c   2007-12-13 05:25:10.850243788 +0100 
    373 +++ madwifi-dfs-r3053/tools/wlanconfig.c        2007-12-13 05:25:11.246266355 +0100 
     370Index: madwifi-trunk-r3314/tools/wlanconfig.c 
     371=================================================================== 
     372--- madwifi-trunk-r3314.orig/tools/wlanconfig.c 2008-02-20 18:10:46.299152832 +0100 
     373+++ madwifi-trunk-r3314/tools/wlanconfig.c      2008-02-20 18:10:46.715176538 +0100 
    374374@@ -62,6 +62,10 @@ 
    375375 #include "net80211/ieee80211_crypto.h" 
     
    403403        unsigned char bnounit = 0; 
    404404        char *if_base = NULL; 
    405 Index: madwifi-dfs-r3053/tools/ath_info.c 
    406 =================================================================== 
    407 --- madwifi-dfs-r3053.orig/tools/ath_info.c     2007-12-13 05:25:10.858244244 +0100 
    408 +++ madwifi-dfs-r3053/tools/ath_info.c  2007-12-13 05:25:11.246266355 +0100 
     405Index: madwifi-trunk-r3314/tools/ath_info.c 
     406=================================================================== 
     407--- madwifi-trunk-r3314.orig/tools/ath_info.c   2008-02-20 18:10:46.311153513 +0100 
     408+++ madwifi-trunk-r3314/tools/ath_info.c        2008-02-20 18:10:46.715176538 +0100 
    409409@@ -738,7 +738,12 @@ 
    410410                "unlawful radio transmissions!\n\n"); 
  • trunk/package/madwifi/patches/104-autocreate_none.patch

    r9719 r10511  
    1 Index: madwifi-dfs-r3053/ath/if_ath.c 
     1Index: madwifi-trunk-r3314/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-dfs-r3053.orig/ath/if_ath.c 2007-12-13 05:25:10.754238316 +0100 
    4 +++ madwifi-dfs-r3053/ath/if_ath.c      2007-12-13 05:25:11.582285503 +0100 
    5 @@ -512,7 +512,7 @@ 
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 18:10:46.203147359 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 18:10:47.047195460 +0100 
     5@@ -516,7 +516,7 @@ 
    66        HAL_STATUS status; 
    77        int error = 0; 
  • trunk/package/madwifi/patches/105-ratectl_attach.patch

    r9719 r10511  
    1 Index: madwifi-dfs-r3053/net80211/ieee80211_rate.c 
     1Index: madwifi-trunk-r3314/net80211/ieee80211_rate.c 
    22=================================================================== 
    3 --- madwifi-dfs-r3053.orig/net80211/ieee80211_rate.c    2007-12-13 05:25:10.722236492 +0100 
    4 +++ madwifi-dfs-r3053/net80211/ieee80211_rate.c 2007-12-13 05:25:11.798297814 +0100 
     3--- madwifi-trunk-r3314.orig/net80211/ieee80211_rate.c  2008-02-20 18:10:46.171145535 +0100 
     4+++ madwifi-trunk-r3314/net80211/ieee80211_rate.c       2008-02-20 18:10:47.259207542 +0100 
    55@@ -100,8 +100,18 @@ 
    66                ieee80211_load_module(buf); 
  • trunk/package/madwifi/patches/111-minstrel_crash.patch

    r9719 r10511  
    1 Index: madwifi-dfs-r3053/ath_rate/minstrel/minstrel.c 
     1Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c 
    22=================================================================== 
    3 --- madwifi-dfs-r3053.orig/ath_rate/minstrel/minstrel.c 2007-12-13 05:25:10.690234670 +0100 
    4 +++ madwifi-dfs-r3053/ath_rate/minstrel/minstrel.c      2007-12-13 05:25:12.006309667 +0100 
     3--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c       2008-02-20 18:10:46.143143939 +0100 
     4+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c    2008-02-20 18:10:47.471219622 +0100 
    55@@ -393,6 +393,9 @@ 
    66                struct minstrel_node *sn = ATH_NODE_MINSTREL(an); 
  • trunk/package/madwifi/patches/113-no_ibss_pwrsave.patch

    r9719 r10511  
    1 Index: madwifi-dfs-r3053/net80211/ieee80211_scan.c 
     1Index: madwifi-trunk-r3314/net80211/ieee80211_scan.c 
    22=================================================================== 
    3 --- madwifi-dfs-r3053.orig/net80211/ieee80211_scan.c    2007-12-13 05:25:10.658232846 +0100 
    4 +++ madwifi-dfs-r3053/net80211/ieee80211_scan.c 2007-12-13 05:25:12.214321521 +0100 
     3--- madwifi-trunk-r3314.orig/net80211/ieee80211_scan.c  2008-02-20 18:10:46.107141889 +0100 
     4+++ madwifi-trunk-r3314/net80211/ieee80211_scan.c       2008-02-20 18:10:47.679231478 +0100 
    55@@ -291,7 +291,8 @@ 
    66        struct ieee80211com *ic = vap->iv_ic; 
  • trunk/package/madwifi/patches/122-replayfail_workaround.patch

    r9719 r10511  
    1 Index: madwifi-dfs-r3053/net80211/ieee80211_linux.c 
     1Index: madwifi-trunk-r3314/net80211/ieee80211_linux.c 
    22=================================================================== 
    3 --- madwifi-dfs-r3053.orig/net80211/ieee80211_linux.c   2007-12-13 05:25:10.626231021 +0100 
    4 +++ madwifi-dfs-r3053/net80211/ieee80211_linux.c        2007-12-13 05:25:12.422333377 +0100 
     3--- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.c 2008-02-20 18:10:46.075140065 +0100 
     4+++ madwifi-trunk-r3314/net80211/ieee80211_linux.c      2008-02-20 18:10:47.887243331 +0100 
    55@@ -331,6 +331,9 @@ 
    66                k->wk_cipher->ic_name, k->wk_keyix, 
    7                 (unsigned long long)rsc ); 
     7                (unsigned long long)rsc); 
    88  
    99+       /* disabled for now due to bogus events for unknown reasons */ 
     
    1111+ 
    1212        /* TODO: needed parameters: count, keyid, key type, src address, TSC */ 
    13         snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag, 
     13        snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=" MAC_FMT ")", tag, 
    1414                k->wk_keyix, 
  • trunk/package/madwifi/patches/123-ccmp_checks.patch

    r9719 r10511  
    1 Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_ccmp.c 
     1Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c 
    22=================================================================== 
    3 --- madwifi-dfs-r3053.orig/net80211/ieee80211_crypto_ccmp.c     2007-12-13 05:25:10.594229197 +0100 
    4 +++ madwifi-dfs-r3053/net80211/ieee80211_crypto_ccmp.c  2007-12-13 05:25:12.634345457 +0100 
     3--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_ccmp.c   2008-02-20 18:10:46.043138240 +0100 
     4+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c        2008-02-20 18:10:48.095255184 +0100 
    55@@ -475,6 +475,9 @@ 
    66        uint8_t *mic, *pos; 
  • trunk/package/madwifi/patches/124-linux24_compat.patch

    r10334 r10511  
    11Index: madwifi-trunk-r3314/ath/if_athvar.h 
    22=================================================================== 
    3 --- madwifi-trunk-r3314.orig/ath/if_athvar.h    2008-01-31 03:29:54.077194330 +0100 
    4 +++ madwifi-trunk-r3314/ath/if_athvar.h 2008-01-31 03:31:07.693389480 +0100 
     3--- madwifi-trunk-r3314.orig/ath/if_athvar.h    2008-02-20 18:10:45.991135277 +0100 
     4+++ madwifi-trunk-r3314/ath/if_athvar.h 2008-02-20 18:10:48.307267266 +0100 
    55@@ -126,6 +126,11 @@ 
    66 #define ATH_GET_NETDEV_DEV(ndev)       ((ndev)->class_dev.dev) 
     
    1717Index: madwifi-trunk-r3314/ath/if_ath_radar.c 
    1818=================================================================== 
    19 --- madwifi-trunk-r3314.orig/ath/if_ath_radar.c 2008-01-31 03:29:54.081194559 +0100 
    20 +++ madwifi-trunk-r3314/ath/if_ath_radar.c      2008-01-31 03:31:07.697389706 +0100 
     19--- madwifi-trunk-r3314.orig/ath/if_ath_radar.c 2008-02-20 18:10:45.999135735 +0100 
     20+++ madwifi-trunk-r3314/ath/if_ath_radar.c      2008-02-20 18:10:48.307267266 +0100 
    2121@@ -92,6 +92,13 @@ 
    2222 #define nofloat_pct(_value, _pct) \ 
     
    3535Index: madwifi-trunk-r3314/ath/if_ath.c 
    3636=================================================================== 
    37 --- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-01-31 03:30:19.778658973 +0100 
    38 +++ madwifi-trunk-r3314/ath/if_ath.c    2008-01-31 03:31:07.709390390 +0100 
     37--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 18:10:47.047195460 +0100 
     38+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 18:10:48.315267722 +0100 
    3939@@ -4705,6 +4705,46 @@ 
    4040 #undef USE_SHPREAMBLE 
     
    8787=================================================================== 
    8888--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    89 +++ madwifi-trunk-r3314/net80211/sort.c 2008-01-31 03:31:07.717390845 +0100 
     89+++ madwifi-trunk-r3314/net80211/sort.c 2008-02-20 18:10:48.319267951 +0100 
    9090@@ -0,0 +1,120 @@ 
    9191+/* 
  • trunk/package/madwifi/patches/126-rxerr_frames.patch

    r9719 r10511  
    1 Index: madwifi-dfs-r3053/ath/if_ath.c 
     1Index: madwifi-trunk-r3314/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-dfs-r3053.orig/ath/if_ath.c 2007-12-13 05:25:12.854357994 +0100 
    4 +++ madwifi-dfs-r3053/ath/if_ath.c      2007-12-13 05:25:13.122373270 +0100 
    5 @@ -6410,8 +6410,9 @@ 
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 18:10:48.315267722 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 18:10:48.567282084 +0100 
     5@@ -6474,8 +6474,9 @@ 
    66                        /* 
    77                         * Reject error frames if we have no vaps that 
  • trunk/package/madwifi/patches/200-no_debug.patch

    r10506 r10511  
    11Index: madwifi-trunk-r3314/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 17:49:12.301561550 +0100 
    4 +++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 17:49:12.321562687 +0100 
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 18:10:48.567282084 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 18:10:48.783294393 +0100 
    55@@ -42,7 +42,6 @@ 
    66  * This software is derived from work of Atsushi Onoe; his contribution 
     
    6464Index: madwifi-trunk-r3314/ath_rate/amrr/amrr.c 
    6565=================================================================== 
    66 --- madwifi-trunk-r3314.orig/ath_rate/amrr/amrr.c       2008-02-20 17:49:02.913026521 +0100 
    67 +++ madwifi-trunk-r3314/ath_rate/amrr/amrr.c    2008-02-20 17:49:12.321562687 +0100 
     66--- madwifi-trunk-r3314.orig/ath_rate/amrr/amrr.c       2008-02-20 18:10:45.875128667 +0100 
     67+++ madwifi-trunk-r3314/ath_rate/amrr/amrr.c    2008-02-20 18:10:48.787294621 +0100 
    6868@@ -70,7 +70,9 @@ 
    6969  
     
    7878Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c 
    7979=================================================================== 
    80 --- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c       2008-02-20 17:49:12.229557442 +0100 
    81 +++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c    2008-02-20 17:49:12.329563147 +0100 
     80--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c       2008-02-20 18:10:47.471219622 +0100 
     81+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c    2008-02-20 18:10:48.795295077 +0100 
    8282@@ -117,7 +117,9 @@ 
    8383  
     
    9292Index: madwifi-trunk-r3314/ath_rate/onoe/onoe.c 
    9393=================================================================== 
    94 --- madwifi-trunk-r3314.orig/ath_rate/onoe/onoe.c       2008-02-20 17:49:02.929027436 +0100 
    95 +++ madwifi-trunk-r3314/ath_rate/onoe/onoe.c    2008-02-20 17:49:12.333563371 +0100 
     94--- madwifi-trunk-r3314.orig/ath_rate/onoe/onoe.c       2008-02-20 18:10:45.891129578 +0100 
     95+++ madwifi-trunk-r3314/ath_rate/onoe/onoe.c    2008-02-20 18:10:48.799295306 +0100 
    9696@@ -66,7 +66,9 @@ 
    9797  
     
    106106Index: madwifi-trunk-r3314/ath_rate/sample/sample.c 
    107107=================================================================== 
    108 --- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c   2008-02-20 17:49:02.937027889 +0100 
    109 +++ madwifi-trunk-r3314/ath_rate/sample/sample.c        2008-02-20 17:49:12.333563371 +0100 
     108--- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c   2008-02-20 18:10:45.899130036 +0100 
     109+++ madwifi-trunk-r3314/ath_rate/sample/sample.c        2008-02-20 18:10:48.803295532 +0100 
    110110@@ -68,7 +68,9 @@ 
    111111  
     
    121121Index: madwifi-trunk-r3314/tools/do_multi.c 
    122122=================================================================== 
    123 --- madwifi-trunk-r3314.orig/tools/do_multi.c   2008-02-20 17:49:12.181554711 +0100 
    124 +++ madwifi-trunk-r3314/tools/do_multi.c        2008-02-20 17:49:12.333563371 +0100 
     123--- madwifi-trunk-r3314.orig/tools/do_multi.c   2008-02-20 18:10:46.711176309 +0100 
     124+++ madwifi-trunk-r3314/tools/do_multi.c        2008-02-20 18:10:48.807295761 +0100 
    125125@@ -9,16 +9,20 @@ 
    126126  
     
    146146Index: madwifi-trunk-r3314/tools/Makefile 
    147147=================================================================== 
    148 --- madwifi-trunk-r3314.orig/tools/Makefile     2008-02-20 17:49:12.181554711 +0100 
    149 +++ madwifi-trunk-r3314/tools/Makefile  2008-02-20 17:49:12.333563371 +0100 
     148--- madwifi-trunk-r3314.orig/tools/Makefile     2008-02-20 18:10:46.715176538 +0100 
     149+++ madwifi-trunk-r3314/tools/Makefile  2008-02-20 18:10:48.807295761 +0100 
    150150@@ -46,9 +46,10 @@ 
    151151 HAL=   $(TOP)/hal 
     
    180180Index: madwifi-trunk-r3314/net80211/ieee80211_linux.h 
    181181=================================================================== 
    182 --- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.h 2008-02-20 17:49:02.961029258 +0100 
    183 +++ madwifi-trunk-r3314/net80211/ieee80211_linux.h      2008-02-20 17:49:12.337563594 +0100 
     182--- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.h 2008-02-20 18:10:45.919131175 +0100 
     183+++ madwifi-trunk-r3314/net80211/ieee80211_linux.h      2008-02-20 18:10:48.807295761 +0100 
    184184@@ -29,8 +29,6 @@ 
    185185 #ifndef _NET80211_IEEE80211_LINUX_H_ 
     
    193193Index: madwifi-trunk-r3314/Makefile.inc 
    194194=================================================================== 
    195 --- madwifi-trunk-r3314.orig/Makefile.inc       2008-02-20 17:49:02.969029715 +0100 
    196 +++ madwifi-trunk-r3314/Makefile.inc    2008-02-20 17:49:12.337563594 +0100 
     195--- madwifi-trunk-r3314.orig/Makefile.inc       2008-02-20 18:10:45.927131631 +0100 
     196+++ madwifi-trunk-r3314/Makefile.inc    2008-02-20 18:10:48.807295761 +0100 
    197197@@ -148,7 +148,8 @@ 
    198198 TOOLS=  $(TOP)/tools  
     
    207207Index: madwifi-trunk-r3314/ath/if_ath_radar.c 
    208208=================================================================== 
    209 --- madwifi-trunk-r3314.orig/ath/if_ath_radar.c 2008-02-20 17:49:22.238127798 +0100 
    210 +++ madwifi-trunk-r3314/ath/if_ath_radar.c      2008-02-20 17:49:27.142407277 +0100 
     209--- madwifi-trunk-r3314.orig/ath/if_ath_radar.c 2008-02-20 18:10:48.307267266 +0100 
     210+++ madwifi-trunk-r3314/ath/if_ath_radar.c      2008-02-20 18:10:48.811295991 +0100 
    211211@@ -19,8 +19,6 @@ 
    212212  * $Id: if_ath_radar.c 2464 2007-06-15 22:51:56Z mtaylor $ 
  • trunk/package/madwifi/patches/300-napi_polling.patch

    r10296 r10511  
    1 Index: madwifi-trunk-r3280/ath/if_ath.c 
     1Index: madwifi-trunk-r3314/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-trunk-r3280.orig/ath/if_ath.c       2008-01-28 17:29:22.989895792 +0100 
    4 +++ madwifi-trunk-r3280/ath/if_ath.c    2008-01-28 20:00:09.319637124 +0100 
    5 @@ -184,7 +184,7 @@ 
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 21:56:33.725243076 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 21:57:34.912729951 +0100 
     5@@ -184,7 +184,11 @@ 
    66        struct sk_buff *, int, int, u_int64_t); 
    77 static void ath_setdefantenna(struct ath_softc *, u_int); 
    88 static struct ath_txq *ath_txq_setup(struct ath_softc *, int, int); 
    99-static void ath_rx_tasklet(TQUEUE_ARG); 
     10+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
     11+static int ath_rx_poll(struct napi_struct *napi, int budget); 
     12+#else 
    1013+static int ath_rx_poll(struct net_device *dev, int *budget); 
     14+#endif 
    1115 static int ath_hardstart(struct sk_buff *, struct net_device *); 
    1216 static int ath_mgtstart(struct ieee80211com *, struct sk_buff *); 
    1317 #ifdef ATH_SUPERG_COMP 
    14 @@ -542,7 +542,6 @@ 
    15         ATH_TXBUF_LOCK_INIT(sc); 
    16         ATH_RXBUF_LOCK_INIT(sc); 
     18@@ -374,6 +378,9 @@ 
     19                u_int32_t new_clamped_maxtxpower); 
     20 static u_int32_t ath_get_real_maxtxpower(struct ath_softc *sc); 
     21  
     22+static void ath_poll_disable(struct net_device *dev); 
     23+static void ath_poll_enable(struct net_device *dev); 
     24+ 
     25 /* calibrate every 30 secs in steady state but check every second at first. */ 
     26 static int ath_calinterval = ATH_SHORT_CALINTERVAL; 
     27 static int ath_countrycode = CTRY_DEFAULT;     /* country code */ 
     28@@ -545,7 +552,6 @@ 
     29  
     30        atomic_set(&sc->sc_txbuf_counter, 0); 
    1731  
    1832-       ATH_INIT_TQUEUE(&sc->sc_rxtq,     ath_rx_tasklet,       dev); 
     
    2034        ATH_INIT_TQUEUE(&sc->sc_bmisstq,  ath_bmiss_tasklet,    dev); 
    2135        ATH_INIT_TQUEUE(&sc->sc_bstucktq, ath_bstuck_tasklet,   dev); 
    22 @@ -816,6 +815,8 @@ 
     36@@ -819,6 +825,12 @@ 
    2337        dev->set_mac_address = ath_set_mac_address; 
    2438        dev->change_mtu = ath_change_mtu; 
    2539        dev->tx_queue_len = ATH_TXBUF - ATH_TXBUF_MGT_RESERVED; 
     40+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
     41+       netif_napi_add(dev, &sc->sc_napi, ath_rx_poll, 64); 
     42+#else 
    2643+       dev->poll = ath_rx_poll; 
    2744+       dev->weight = 64; 
     45+#endif 
    2846 #ifdef USE_HEADERLEN_RESV 
    2947        dev->hard_header_len += sizeof(struct ieee80211_qosframe) + 
    3048                                sizeof(struct llc) + 
    31 @@ -2206,6 +2207,7 @@ 
     49@@ -2213,6 +2225,7 @@ 
    3250                (status & HAL_INT_GLOBAL)       ? " HAL_INT_GLOBAL"     : "" 
    3351                ); 
     
    3755        /* As soon as we know we have a real interrupt we intend to service,  
    3856         * we will check to see if we need an initial hardware TSF reading.  
    39 @@ -2263,7 +2265,14 @@ 
     57@@ -2270,7 +2283,23 @@ 
    4058                } 
    4159                if (status & (HAL_INT_RX | HAL_INT_RXPHY)) { 
     
    4361-                       ATH_SCHEDULE_TQUEUE(&sc->sc_rxtq, &needmark); 
    4462+                       sc->sc_isr &= ~HAL_INT_RX; 
    45 +                       if (netif_rx_schedule_prep(dev)) { 
     63+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
     64+                       if (netif_rx_schedule_prep(dev, &sc->sc_napi)) 
     65+#else 
     66+                       if (netif_rx_schedule_prep(dev)) 
     67+#endif 
     68+                       { 
    4669+#ifndef ATH_PRECISE_TSF 
    4770+                               sc->sc_imask &= ~HAL_INT_RX; 
    4871+                               ath_hal_intrset(ah, sc->sc_imask); 
    4972+#endif 
     73+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
     74+                               __netif_rx_schedule(dev, &sc->sc_napi); 
     75+#else 
    5076+                               __netif_rx_schedule(dev); 
     77+#endif 
    5178+                       } 
    5279                } 
    5380                if (status & HAL_INT_TX) { 
    5481 #ifdef ATH_SUPERG_DYNTURBO 
    55 @@ -2289,6 +2298,11 @@ 
     82@@ -2296,6 +2325,11 @@ 
    5683                                } 
    5784                        } 
     
    6592                } 
    6693                if (status & HAL_INT_BMISS) { 
    67 @@ -4011,10 +4025,10 @@ 
    68          * 
    69          * XXX Using in_softirq is not right since we might 
    70          * be called from other soft irq contexts than 
     94@@ -2508,6 +2542,7 @@ 
     95        if (sc->sc_tx99 != NULL) 
     96                sc->sc_tx99->start(sc->sc_tx99); 
     97 #endif 
     98+       ath_poll_enable(dev); 
     99  
     100 done: 
     101        ATH_UNLOCK(sc); 
     102@@ -2548,6 +2583,9 @@ 
     103                if (sc->sc_tx99 != NULL) 
     104                        sc->sc_tx99->stop(sc->sc_tx99); 
     105 #endif 
     106+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
     107+               ath_poll_disable(dev); 
     108+#endif 
     109                netif_stop_queue(dev);  /* XXX re-enabled by ath_newstate */ 
     110                dev->flags &= ~IFF_RUNNING;     /* NB: avoid recursion */ 
     111                ieee80211_stop_running(ic);     /* stop all VAPs */ 
     112@@ -4006,6 +4044,39 @@ 
     113        return ath_keyset(sc, k, mac, vap->iv_bss); 
     114 } 
     115  
     116+static void ath_poll_disable(struct net_device *dev) 
     117+{ 
     118+       struct ath_softc *sc = dev->priv; 
     119+ 
     120+       /* 
     121+        * XXX Using in_softirq is not right since we might 
     122+        * be called from other soft irq contexts than 
     123+        * ath_rx_poll 
     124+        */ 
     125+       if (!in_softirq()) { 
     126+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
     127+               napi_disable(&sc->sc_napi); 
     128+#else 
     129+               netif_poll_disable(dev); 
     130+#endif 
     131+       } 
     132+} 
     133+ 
     134+static void ath_poll_enable(struct net_device *dev) 
     135+{ 
     136+       struct ath_softc *sc = dev->priv; 
     137+ 
     138+       /* NB: see above */ 
     139+       if (!in_softirq()) { 
     140+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
     141+               napi_enable(&sc->sc_napi); 
     142+#else 
     143+               netif_poll_enable(dev); 
     144+#endif 
     145+       } 
     146+} 
     147+ 
     148+ 
     149 /* 
     150  * Block/unblock tx+rx processing while a key change is done. 
     151  * We assume the caller serializes key management operations 
     152@@ -4023,13 +4094,7 @@ 
     153         * When called from the rx tasklet we cannot use 
     154         * tasklet_disable because it will block waiting 
     155         * for us to complete execution. 
     156-        * 
     157-        * XXX Using in_softirq is not right since we might 
     158-        * be called from other soft irq contexts than 
    71159-        * ath_rx_tasklet. 
    72 +        * ath_rx_poll 
    73160         */ 
    74         if (!in_softirq()) 
     161-       if (!in_softirq()) 
    75162-               tasklet_disable(&sc->sc_rxtq); 
    76 +               netif_poll_disable(dev); 
    77163        netif_stop_queue(dev); 
    78164 } 
    79165  
    80 @@ -4027,7 +4041,7 @@ 
     166@@ -4040,9 +4105,9 @@ 
     167        struct ath_softc *sc = dev->priv; 
     168  
    81169        DPRINTF(sc, ATH_DEBUG_KEYCACHE, "End\n"); 
    82         netif_wake_queue(dev); 
    83         if (!in_softirq())              /* NB: see above */ 
     170-       netif_wake_queue(dev); 
     171-       if (!in_softirq())              /* NB: see above */ 
    84172-               tasklet_enable(&sc->sc_rxtq); 
    85 +               netif_poll_enable(dev); 
     173+ 
     174+       if (dev->flags&IFF_RUNNING) 
     175+               netif_wake_queue(dev); 
    86176 } 
    87177  
    88178 /* 
    89 @@ -6329,13 +6343,12 @@ 
     179@@ -6347,13 +6412,23 @@ 
    90180        sc->sc_rxotherant = 0; 
    91181 } 
     
    94184-ath_rx_tasklet(TQUEUE_ARG data) 
    95185+static int 
     186+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
     187+ath_rx_poll(struct napi_struct *napi, int budget) 
     188+#else 
    96189+ath_rx_poll(struct net_device *dev, int *budget) 
     190+#endif 
    97191 { 
    98192 #define        PA2DESC(_sc, _pa) \ 
     
    100194                ((_pa) - (_sc)->sc_rxdma.dd_desc_paddr))) 
    101195-       struct net_device *dev = (struct net_device *)data; 
     196+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
     197+       struct ath_softc *sc = container_of(napi, struct ath_softc, sc_napi); 
     198+       struct net_device *dev = sc->sc_dev; 
     199+       u_int rx_limit = budget; 
     200+#else 
     201+       u_int rx_limit = dev->quota; 
     202+#endif 
    102203        struct ath_buf *bf; 
    103204        struct ath_softc *sc = dev->priv; 
    104205        struct ieee80211com *ic = &sc->sc_ic; 
    105 @@ -6347,8 +6360,11 @@ 
     206@@ -6365,8 +6440,10 @@ 
    106207        unsigned int len; 
    107208        int type; 
    108209        u_int phyerr; 
    109210+       u_int processed = 0, early_stop = 0; 
    110 +       u_int rx_limit = dev->quota; 
    111211  
    112212        DPRINTF(sc, ATH_DEBUG_RX_PROC, "invoked\n"); 
     
    115215                bf = STAILQ_FIRST(&sc->sc_rxbuf); 
    116216                if (bf == NULL) {               /* XXX ??? can this happen */ 
    117 @@ -6372,6 +6388,13 @@ 
     217@@ -6390,6 +6467,15 @@ 
    118218                        /* NB: never process the self-linked entry at the end */ 
    119219                        break; 
    120220                } 
    121221+ 
     222+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
    122223+               processed++; 
     224+#endif 
    123225+               if (rx_limit-- < 0) { 
    124226+                       early_stop = 1; 
     
    129231                if (skb == NULL) { 
    130232                        EPRINTF(sc, "Dropping; buffer contains NULL skbuff.\n"); 
    131 @@ -6419,6 +6442,7 @@ 
     233@@ -6437,6 +6523,7 @@ 
    132234                                sc->sc_stats.ast_rx_phyerr++; 
    133235                                phyerr = rs->rs_phyerr & 0x1f; 
     
    137239                        if (rs->rs_status & HAL_RXERR_DECRYPT) { 
    138240                                /* 
    139 @@ -6614,9 +6638,35 @@ 
     241@@ -6632,9 +6719,38 @@ 
    140242                STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list); 
    141243                ATH_RXBUF_UNLOCK_IRQ(sc); 
     
    156258+               } 
    157259+#endif 
    158 +               netif_rx_complete(dev); 
    159 + 
    160260+#ifndef ATH_PRECISE_TSF 
    161261+               sc->sc_imask |= HAL_INT_RX; 
     
    165265+       } 
    166266+ 
     267+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
     268+       netif_rx_complete(dev, napi); 
     269+#else 
     270+       netif_rx_complete(dev); 
    167271+       *budget -= processed; 
     272+#endif 
    168273  
    169274        /* rx signal state monitoring */ 
     
    173278 } 
    174279  
    175 @@ -8267,12 +8317,24 @@ 
     280@@ -8285,12 +8401,24 @@ 
    176281 { 
    177282        struct net_device *dev = (struct net_device *)data; 
     
    198303  
    199304        if (sc->sc_softled) 
    200 @@ -8288,7 +8350,9 @@ 
     305@@ -8306,7 +8434,9 @@ 
    201306 { 
    202307        struct net_device *dev = (struct net_device *)data; 
     
    208313         * Process each active queue. 
    209314         */ 
    210 @@ -8309,6 +8373,16 @@ 
     315@@ -8327,6 +8457,16 @@ 
    211316        if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum)) 
    212317                ath_tx_processq(sc, sc->sc_uapsdq); 
     
    225330  
    226331        if (sc->sc_softled) 
    227 @@ -8324,13 +8398,25 @@ 
     332@@ -8342,13 +8482,25 @@ 
    228333        struct net_device *dev = (struct net_device *)data; 
    229334        struct ath_softc *sc = dev->priv; 
     
    251356  
    252357        if (sc->sc_softled) 
    253 @@ -8405,6 +8491,7 @@ 
     358@@ -8423,6 +8575,7 @@ 
    254359 ath_draintxq(struct ath_softc *sc) 
    255360 { 
     
    259364  
    260365        /* XXX return value */ 
    261 @@ -10261,9 +10348,9 @@ 
     366@@ -10281,9 +10434,9 @@ 
    262367        dev->mtu = mtu; 
    263368        if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) { 
    264369                /* NB: the rx buffers may need to be reallocated */ 
    265370-               tasklet_disable(&sc->sc_rxtq); 
    266 +               netif_poll_disable(dev); 
     371+               ath_poll_disable(dev); 
    267372                error = ath_reset(dev); 
    268373-               tasklet_enable(&sc->sc_rxtq); 
    269 +               netif_poll_enable(dev); 
     374+               ath_poll_enable(dev); 
    270375        } 
    271376        ATH_UNLOCK(sc); 
    272377  
    273 Index: madwifi-trunk-r3280/ath/if_athvar.h 
     378Index: madwifi-trunk-r3314/ath/if_athvar.h 
    274379=================================================================== 
    275 --- madwifi-trunk-r3280.orig/ath/if_athvar.h    2008-01-28 17:29:22.997896245 +0100 
    276 +++ madwifi-trunk-r3280/ath/if_athvar.h 2008-01-28 17:45:06.903383316 +0100 
    277 @@ -50,6 +50,10 @@ 
    278  #include <asm/io.h> 
    279  #include <linux/list.h> 
     380--- madwifi-trunk-r3314.orig/ath/if_athvar.h    2008-02-20 21:56:33.733243528 +0100 
     381+++ madwifi-trunk-r3314/ath/if_athvar.h 2008-02-20 21:57:34.892728811 +0100 
     382@@ -53,6 +53,10 @@ 
     383 # include      <asm/bitops.h> 
     384 #endif 
    280385  
    281386+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) 
     
    286391  * Deduce if tasklets are available.  If not then 
    287392  * fall back to using the immediate work queue. 
    288 @@ -728,7 +732,6 @@ 
     393@@ -616,6 +620,9 @@ 
     394 struct ath_softc { 
     395        struct ieee80211com sc_ic;              /* NB: must be first */ 
     396        struct net_device *sc_dev; 
     397+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
     398+       struct napi_struct sc_napi; 
     399+#endif 
     400        void __iomem *sc_iobase;                /* address of the device */ 
     401        struct semaphore sc_lock;               /* dev-level lock */ 
     402        struct net_device_stats sc_devstats;    /* device statistics */ 
     403@@ -730,7 +737,6 @@ 
    289404        struct ath_buf *sc_rxbufcur;            /* current rx buffer */ 
    290405        u_int32_t *sc_rxlink;                   /* link ptr in last RX desc */ 
     
    294409        u_int8_t sc_defant;                     /* current default antenna */ 
    295410        u_int8_t sc_rxotherant;                 /* RXs on non-default antenna */ 
    296 @@ -741,6 +744,7 @@ 
     411@@ -745,6 +751,7 @@ 
    297412        u_int sc_txintrperiod;                  /* tx interrupt batching */ 
    298413        struct ath_txq sc_txq[HAL_NUM_TX_QUEUES]; 
     
    302417        u_int8_t sc_grppoll_str[GRPPOLL_RATE_STR_LEN]; 
    303418        struct ath_descdma sc_bdma;             /* beacon descriptors */ 
    304 @@ -854,6 +858,8 @@ 
     419@@ -858,6 +865,8 @@ 
    305420 #define        ATH_TXBUF_LOCK_CHECK(_sc) 
    306421 #endif 
     
    311426 #define        ATH_RXBUF_LOCK_INIT(_sc)        spin_lock_init(&(_sc)->sc_rxbuflock) 
    312427 #define        ATH_RXBUF_LOCK_DESTROY(_sc) 
    313 Index: madwifi-trunk-r3280/net80211/ieee80211_input.c 
     428Index: madwifi-trunk-r3314/net80211/ieee80211_input.c 
    314429=================================================================== 
    315 --- madwifi-trunk-r3280.orig/net80211/ieee80211_input.c 2008-01-28 17:29:23.005896702 +0100 
    316 +++ madwifi-trunk-r3280/net80211/ieee80211_input.c      2008-01-28 19:52:50.586635164 +0100 
    317 @@ -1197,7 +1197,7 @@ 
     430--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-02-20 21:56:33.741243986 +0100 
     431+++ madwifi-trunk-r3314/net80211/ieee80211_input.c      2008-02-20 21:57:34.896729040 +0100 
     432@@ -1198,7 +1198,7 @@ 
    318433                        /* attach vlan tag */ 
    319434                        struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni; 
     
    324439                                if (ni_tmp != NULL) { 
    325440                                        /* node reference was leaked */ 
    326 @@ -1208,8 +1208,8 @@ 
     441@@ -1209,8 +1209,8 @@ 
    327442                        skb = NULL; /* SKB is no longer ours */ 
    328443                } else { 
     
    335450                                if (ni_tmp != NULL) { 
    336451                                        /* node reference was leaked */ 
    337 @@ -2314,8 +2314,8 @@ 
     452@@ -2322,8 +2322,8 @@ 
    338453                skb1->protocol = __constant_htons(0x0019);  /* ETH_P_80211_RAW */ 
    339454  
     
    346461                        if (ni_tmp != NULL) { 
    347462                                /* node reference was leaked */ 
    348 Index: madwifi-trunk-r3280/net80211/ieee80211_monitor.c 
     463Index: madwifi-trunk-r3314/net80211/ieee80211_monitor.c 
    349464=================================================================== 
    350 --- madwifi-trunk-r3280.orig/net80211/ieee80211_monitor.c       2008-01-28 17:29:23.013897159 +0100 
    351 +++ madwifi-trunk-r3280/net80211/ieee80211_monitor.c    2008-01-28 17:29:26.430091834 +0100 
     465--- madwifi-trunk-r3314.orig/net80211/ieee80211_monitor.c       2008-02-20 21:56:33.749244442 +0100 
     466+++ madwifi-trunk-r3314/net80211/ieee80211_monitor.c    2008-02-20 21:57:34.900729266 +0100 
    352467@@ -584,8 +584,8 @@ 
    353468                        skb1->protocol =  
     
    361476                                 * the skb. */ 
    362477                                if (SKB_CB(skb1)->ni != NULL) 
    363 Index: madwifi-trunk-r3280/net80211/ieee80211_skb.c 
     478Index: madwifi-trunk-r3314/net80211/ieee80211_skb.c 
    364479=================================================================== 
    365 --- madwifi-trunk-r3280.orig/net80211/ieee80211_skb.c   2008-01-28 17:29:23.017897384 +0100 
    366 +++ madwifi-trunk-r3280/net80211/ieee80211_skb.c        2008-01-28 17:29:26.446092748 +0100 
     480--- madwifi-trunk-r3314.orig/net80211/ieee80211_skb.c   2008-02-20 21:56:33.757244897 +0100 
     481+++ madwifi-trunk-r3314/net80211/ieee80211_skb.c        2008-02-20 21:57:34.904729495 +0100 
    367482@@ -73,7 +73,7 @@ 
    368483 #undef dev_queue_xmit 
     
    394509 EXPORT_SYMBOL(dev_alloc_skb_debug); 
    395510 EXPORT_SYMBOL(skb_clone_debug); 
    396 Index: madwifi-trunk-r3280/net80211/ieee80211_skb.h 
     511Index: madwifi-trunk-r3314/net80211/ieee80211_skb.h 
    397512=================================================================== 
    398 --- madwifi-trunk-r3280.orig/net80211/ieee80211_skb.h   2008-01-28 17:29:23.029898072 +0100 
    399 +++ madwifi-trunk-r3280/net80211/ieee80211_skb.h        2008-01-28 17:29:26.458093432 +0100 
     513--- madwifi-trunk-r3314.orig/net80211/ieee80211_skb.h   2008-02-20 21:56:33.765245356 +0100 
     514+++ madwifi-trunk-r3314/net80211/ieee80211_skb.h        2008-02-20 21:57:34.908729722 +0100 
    400515@@ -116,7 +116,7 @@ 
    401516 int  vlan_hwaccel_receive_skb_debug(struct sk_buff *skb,  
  • trunk/package/madwifi/patches/305-pureg_fix.patch

    r10294 r10511  
    1 Index: madwifi-trunk-r3280/ath/if_ath.c 
     1Index: madwifi-trunk-r3314/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-trunk-r3280.orig/ath/if_ath.c       2008-01-28 17:29:41.614957171 +0100 
    4 +++ madwifi-trunk-r3280/ath/if_ath.c    2008-01-28 17:29:54.895713998 +0100 
    5 @@ -4080,7 +4080,9 @@ 
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 21:57:41.025078273 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 21:57:44.393270217 +0100 
     5@@ -4146,7 +4146,9 @@ 
    66                rfilt |= HAL_RX_FILTER_PROM; 
    77        if (ic->ic_opmode == IEEE80211_M_STA || 
     
    1414        if (sc->sc_nmonvaps > 0) 
    1515                rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON | 
    16 Index: madwifi-trunk-r3280/net80211/ieee80211_input.c 
     16Index: madwifi-trunk-r3314/net80211/ieee80211_input.c 
    1717=================================================================== 
    18 --- madwifi-trunk-r3280.orig/net80211/ieee80211_input.c 2008-01-28 17:29:26.378088873 +0100 
    19 +++ madwifi-trunk-r3280/net80211/ieee80211_input.c      2008-01-28 17:29:54.999719926 +0100 
     18--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-02-20 21:57:41.037078957 +0100 
     19+++ madwifi-trunk-r3314/net80211/ieee80211_input.c      2008-02-20 21:57:44.401270672 +0100 
    2020@@ -346,11 +346,12 @@ 
    2121                                bssid = wh->i_addr3; 
     
    5454                case IEEE80211_M_WDS: 
    5555                        if (skb->len < sizeof(struct ieee80211_frame_addr4)) { 
    56 @@ -3058,7 +3055,7 @@ 
     56@@ -3066,7 +3063,7 @@ 
    5757        u_int8_t *frm, *efrm; 
    5858        u_int8_t *ssid, *rates, *xrates, *suppchan, *wpa, *rsn, *wme, *ath; 
     
    6363  
    6464        if (ni_or_null == NULL) 
    65 @@ -3088,11 +3085,15 @@ 
     65@@ -3096,11 +3093,15 @@ 
    6666                 *    o station mode when associated (to collect state 
    6767                 *      updates such as 802.11g slot time), or 
     
    8080                        return; 
    8181                } 
    82 @@ -3176,6 +3177,7 @@ 
     82@@ -3184,6 +3185,7 @@ 
    8383                                        break; 
    8484                                } 
     
    8888                        case IEEE80211_ELEMID_RSN: 
    8989                                scan.rsn = frm; 
    90 @@ -3413,6 +3415,20 @@ 
     90@@ -3421,6 +3423,20 @@ 
    9191                                ieee80211_bg_scan(vap); 
    9292                        return; 
     
    109109                 * If scanning, just pass information to the scan module. 
    110110                 */ 
    111 Index: madwifi-trunk-r3280/net80211/ieee80211_node.c 
     111Index: madwifi-trunk-r3314/net80211/ieee80211_node.c 
    112112=================================================================== 
    113 --- madwifi-trunk-r3280.orig/net80211/ieee80211_node.c  2008-01-28 17:27:08.000000000 +0100 
    114 +++ madwifi-trunk-r3280/net80211/ieee80211_node.c       2008-01-28 17:29:55.199731324 +0100 
     113--- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c  2008-02-20 21:56:33.629237604 +0100 
     114+++ madwifi-trunk-r3314/net80211/ieee80211_node.c       2008-02-20 21:57:44.409271127 +0100 
    115115@@ -383,10 +383,16 @@ 
    116116        /* Update country ie information */ 
     
    132132        (void) ieee80211_sta_join1(PASS_NODE(ni)); 
    133133 } 
    134 Index: madwifi-trunk-r3280/net80211/ieee80211_proto.c 
     134Index: madwifi-trunk-r3314/net80211/ieee80211_proto.c 
    135135=================================================================== 
    136 --- madwifi-trunk-r3280.orig/net80211/ieee80211_proto.c 2008-01-28 17:27:08.000000000 +0100 
    137 +++ madwifi-trunk-r3280/net80211/ieee80211_proto.c      2008-01-28 17:29:55.299737023 +0100 
     136--- madwifi-trunk-r3314.orig/net80211/ieee80211_proto.c 2008-02-20 21:56:33.633237829 +0100 
     137+++ madwifi-trunk-r3314/net80211/ieee80211_proto.c      2008-02-20 21:57:44.413271357 +0100 
    138138@@ -595,6 +595,28 @@ 
    139139        { 4, { 2, 4, 11, 22 } },        /* IEEE80211_MODE_TURBO_G (mixed b/g) */ 
     
    165165  * Mark the basic rates for the 11g rate table based on the 
    166166  * specified mode.  For 11b compatibility we mark only 11b 
    167 Index: madwifi-trunk-r3280/net80211/ieee80211_var.h 
     167Index: madwifi-trunk-r3314/net80211/ieee80211_var.h 
    168168=================================================================== 
    169 --- madwifi-trunk-r3280.orig/net80211/ieee80211_var.h   2008-01-28 17:27:08.000000000 +0100 
    170 +++ madwifi-trunk-r3280/net80211/ieee80211_var.h        2008-01-28 17:30:20.585177966 +0100 
    171 @@ -694,6 +694,7 @@ 
     169--- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h   2008-02-20 21:56:33.645238517 +0100 
     170+++ madwifi-trunk-r3314/net80211/ieee80211_var.h        2008-02-20 21:57:44.417271583 +0100 
     171@@ -707,6 +707,7 @@ 
    172172 void ieee80211_build_sc_ie(struct ieee80211com *); 
    173173 void ieee80211_dfs_action(struct ieee80211com *); 
  • trunk/package/madwifi/patches/309-micfail_detect.patch

    r10294 r10511  
    1 Index: madwifi-dfs-r3280/ath/if_ath.c 
    2 =================================================================== 
    3 --- madwifi-dfs-r3280.orig/ath/if_ath.c 2008-01-28 17:14:55.182157045 +0100 
    4 +++ madwifi-dfs-r3280/ath/if_ath.c      2008-01-28 17:15:04.876271620 +0100 
    5 @@ -6379,6 +6379,7 @@ 
     1Index: madwifi-trunk-r3314/ath/if_ath.c 
     2=================================================================== 
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 21:55:41.314256342 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 21:56:10.819937775 +0100 
     5@@ -6443,6 +6443,7 @@ 
     6        int type; 
    67        u_int phyerr; 
    78        u_int processed = 0, early_stop = 0; 
    8         u_int rx_limit = dev->quota; 
    99+       u_int mic_fail = 0; 
    1010  
    1111        DPRINTF(sc, ATH_DEBUG_RX_PROC, "invoked\n"); 
    1212 process_rx_again: 
    13 @@ -6478,24 +6479,8 @@ 
     13@@ -6544,24 +6545,8 @@ 
    1414                        } 
    1515                        if (rs->rs_status & HAL_RXERR_MIC) { 
     
    3838                        /* 
    3939                         * Reject error frames if we have no vaps that 
    40 @@ -6534,8 +6519,9 @@ 
     40@@ -6600,8 +6585,9 @@ 
    4141                /* 
    4242                 * Finished monitor mode handling, now reject 
     
    4949                        goto rx_next; 
    5050                } 
    51 @@ -6543,6 +6529,26 @@ 
     51@@ -6609,6 +6595,26 @@ 
    5252                /* remove the CRC */ 
    5353                skb_trim(skb, skb->len - IEEE80211_CRC_LEN); 
     
    7676                 * From this point on we assume the frame is at least 
    7777                 * as large as ieee80211_frame_min; verify that. 
    78 @@ -6555,6 +6561,7 @@ 
     78@@ -6621,6 +6627,7 @@ 
    7979                        goto rx_next; 
    8080                } 
     
    8484                 * Normal receive. 
    8585                 */ 
    86 Index: madwifi-dfs-r3280/net80211/ieee80211_crypto_ccmp.c 
    87 =================================================================== 
    88 --- madwifi-dfs-r3280.orig/net80211/ieee80211_crypto_ccmp.c     2008-01-28 17:14:16.203935804 +0100 
    89 +++ madwifi-dfs-r3280/net80211/ieee80211_crypto_ccmp.c  2008-01-28 17:15:04.916253895 +0100 
     86Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c 
     87=================================================================== 
     88--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_ccmp.c   2008-02-20 21:52:06.822033125 +0100 
     89+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c        2008-02-20 21:55:45.302483625 +0100 
    9090@@ -73,7 +73,7 @@ 
    9191 static int ccmp_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); 
     
    106106        return 1; 
    107107 } 
    108 Index: madwifi-dfs-r3280/net80211/ieee80211_crypto.h 
    109 =================================================================== 
    110 --- madwifi-dfs-r3280.orig/net80211/ieee80211_crypto.h  2008-01-28 17:13:49.000000000 +0100 
    111 +++ madwifi-dfs-r3280/net80211/ieee80211_crypto.h       2008-01-28 17:15:05.116165297 +0100 
     108Index: madwifi-trunk-r3314/net80211/ieee80211_crypto.h 
     109=================================================================== 
     110--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto.h        2008-02-20 21:50:40.149093918 +0100 
     111+++ madwifi-trunk-r3314/net80211/ieee80211_crypto.h     2008-02-20 21:55:45.310484070 +0100 
    112112@@ -145,7 +145,7 @@ 
    113113        int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t); 
     
    132132  
    133133 /* 
    134 Index: madwifi-dfs-r3280/net80211/ieee80211_crypto_none.c 
    135 =================================================================== 
    136 --- madwifi-dfs-r3280.orig/net80211/ieee80211_crypto_none.c     2008-01-28 17:13:49.000000000 +0100 
    137 +++ madwifi-dfs-r3280/net80211/ieee80211_crypto_none.c  2008-01-28 17:15:05.316076693 +0100 
     134Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c 
     135=================================================================== 
     136--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_none.c   2008-02-20 21:50:40.153094148 +0100 
     137+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c        2008-02-20 21:55:45.314484297 +0100 
    138138@@ -52,7 +52,7 @@ 
    139139 static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); 
     
    154154        struct ieee80211vap *vap = k->wk_private; 
    155155  
    156 Index: madwifi-dfs-r3280/net80211/ieee80211_crypto_tkip.c 
    157 =================================================================== 
    158 --- madwifi-dfs-r3280.orig/net80211/ieee80211_crypto_tkip.c     2008-01-28 17:13:49.000000000 +0100 
    159 +++ madwifi-dfs-r3280/net80211/ieee80211_crypto_tkip.c  2008-01-28 17:15:05.519986320 +0100 
     156Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c 
     157=================================================================== 
     158--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_tkip.c   2008-02-20 21:50:40.161094600 +0100 
     159+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c        2008-02-20 21:55:45.314484297 +0100 
    160160@@ -57,7 +57,7 @@ 
    161161 static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); 
     
    185185                u8 mic[IEEE80211_WEP_MICLEN]; 
    186186                u8 mic0[IEEE80211_WEP_MICLEN]; 
    187 Index: madwifi-dfs-r3280/net80211/ieee80211_crypto_wep.c 
    188 =================================================================== 
    189 --- madwifi-dfs-r3280.orig/net80211/ieee80211_crypto_wep.c      2008-01-28 17:13:49.000000000 +0100 
    190 +++ madwifi-dfs-r3280/net80211/ieee80211_crypto_wep.c   2008-01-28 17:15:05.731892402 +0100 
     187Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c 
     188=================================================================== 
     189--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_wep.c    2008-02-20 21:50:40.169095058 +0100 
     190+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c 2008-02-20 21:55:45.314484297 +0100 
    191191@@ -54,7 +54,7 @@ 
    192192 static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); 
     
    207207        return 1; 
    208208 } 
    209 Index: madwifi-dfs-r3280/net80211/ieee80211_input.c 
    210 =================================================================== 
    211 --- madwifi-dfs-r3280.orig/net80211/ieee80211_input.c   2008-01-28 17:14:55.186157275 +0100 
    212 +++ madwifi-dfs-r3280/net80211/ieee80211_input.c        2008-01-28 17:15:05.831848102 +0100 
     209Index: madwifi-trunk-r3314/net80211/ieee80211_input.c 
     210=================================================================== 
     211--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-02-20 21:55:41.318256570 +0100 
     212+++ madwifi-trunk-r3314/net80211/ieee80211_input.c      2008-02-20 21:55:45.318484528 +0100 
    213213@@ -669,7 +669,7 @@ 
    214214                 * Next strip any MSDU crypto bits. 
     
    220220                                ni->ni_macaddr, "data", "%s", "demic error"); 
    221221                        IEEE80211_NODE_STAT(ni, rx_demicfail); 
    222 @@ -4222,6 +4222,47 @@ 
     222@@ -4293,6 +4293,47 @@ 
    223223 } 
    224224 #endif 
     
    268268 /* 
    269269  * Debugging support. 
    270 Index: madwifi-dfs-r3280/net80211/ieee80211_proto.h 
    271 =================================================================== 
    272 --- madwifi-dfs-r3280.orig/net80211/ieee80211_proto.h   2008-01-28 17:13:49.000000000 +0100 
    273 +++ madwifi-dfs-r3280/net80211/ieee80211_proto.h        2008-01-28 17:15:05.935802033 +0100 
     270Index: madwifi-trunk-r3314/net80211/ieee80211_proto.h 
     271=================================================================== 
     272--- madwifi-trunk-r3314.orig/net80211/ieee80211_proto.h 2008-02-20 21:50:40.185095969 +0100 
     273+++ madwifi-trunk-r3314/net80211/ieee80211_proto.h      2008-02-20 21:55:45.318484528 +0100 
    274274@@ -90,6 +90,7 @@ 
    275275 void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode); 
     
    280280 /* 
    281281  * Return the size of the 802.11 header for a management or data frame. 
    282 Index: madwifi-dfs-r3280/net80211/ieee80211_linux.c 
    283 =================================================================== 
    284 --- madwifi-dfs-r3280.orig/net80211/ieee80211_linux.c   2008-01-28 17:14:16.091929418 +0100 
    285 +++ madwifi-dfs-r3280/net80211/ieee80211_linux.c        2008-01-28 17:18:40.397276522 +0100 
     282Index: madwifi-trunk-r3314/net80211/ieee80211_linux.c 
     283=================================================================== 
     284--- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.c 2008-02-20 21:52:06.810032443 +0100 
     285+++ madwifi-trunk-r3314/net80211/ieee80211_linux.c      2008-02-20 21:55:45.318484528 +0100 
    286286@@ -337,8 +337,8 @@ 
    287287        /* TODO: needed parameters: count, keyid, key type, src address, TSC */ 
     
    295295        wrqu.data.length = strlen(buf); 
    296296        wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); 
    297 Index: madwifi-dfs-r3280/net80211/ieee80211_output.c 
    298 =================================================================== 
    299 --- madwifi-dfs-r3280.orig/net80211/ieee80211_output.c  2008-01-28 17:13:49.000000000 +0100 
    300 +++ madwifi-dfs-r3280/net80211/ieee80211_output.c       2008-01-28 17:15:06.247663812 +0100 
    301 @@ -1083,13 +1083,16 @@ 
     297Index: madwifi-trunk-r3314/net80211/ieee80211_output.c 
     298=================================================================== 
     299--- madwifi-trunk-r3314.orig/net80211/ieee80211_output.c        2008-02-20 21:50:40.197096654 +0100 
     300+++ madwifi-trunk-r3314/net80211/ieee80211_output.c     2008-02-20 21:55:45.326484992 +0100 
     301@@ -1074,13 +1074,16 @@ 
    302302                        cip = (struct ieee80211_cipher *) key->wk_cipher; 
    303303                        ciphdrsize = cip->ic_header; 
     
    319319                /* 
    320320                 * Allocate sk_buff for each subsequent fragment; First fragment 
    321 Index: madwifi-dfs-r3280/net80211/ieee80211_node.c 
    322 =================================================================== 
    323 --- madwifi-dfs-r3280.orig/net80211/ieee80211_node.c    2008-01-28 17:14:55.410170040 +0100 
    324 +++ madwifi-dfs-r3280/net80211/ieee80211_node.c 2008-01-28 17:15:06.351617734 +0100 
    325 @@ -2259,11 +2259,13 @@ 
     321Index: madwifi-trunk-r3314/net80211/ieee80211_node.c 
     322=================================================================== 
     323--- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c  2008-02-20 21:55:41.318256570 +0100 
     324+++ madwifi-trunk-r3314/net80211/ieee80211_node.c       2008-02-20 21:55:45.326484992 +0100 
     325@@ -2261,11 +2261,13 @@ 
    326326        /* From this point onwards we can no longer find the node, 
    327327         * so no more references are generated 
  • trunk/package/madwifi/patches/310-noise_get.patch

    r10294 r10511  
    1 Index: madwifi-trunk-r3280/ath/if_ath.c 
     1Index: madwifi-trunk-r3314/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-trunk-r3280.orig/ath/if_ath.c       2008-01-28 17:30:33.325904012 +0100 
    4 +++ madwifi-trunk-r3280/ath/if_ath.c    2008-01-28 17:31:21.850243393 +0100 
    5 @@ -1674,8 +1674,6 @@ 
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 21:58:41.864545316 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 21:58:45.732765757 +0100 
     5@@ -1692,8 +1692,6 @@ 
    66         * get to reality.  This value is used in monitor mode and by tools like 
    77         * Wireshark and Kismet. 
     
    1212        if (sc->sc_rxbufcur == NULL) 
    1313                sc->sc_rxbufcur = STAILQ_FIRST(&sc->sc_rxbuf); 
    14 @@ -8868,6 +8866,7 @@ 
     14@@ -8959,6 +8957,7 @@ 
    1515                        sc->sc_curchan.channel); 
    1616                sc->sc_stats.ast_per_calfail++; 
     
    2020        ath_hal_process_noisefloor(ah); 
    2121        if (isIQdone == AH_TRUE) { 
    22 @@ -8936,6 +8935,7 @@ 
     22@@ -9027,6 +9026,7 @@ 
    2323        struct ath_softc *sc = dev->priv; 
    2424  
     
    2828         * If we are returning to our bss channel then mark state 
    2929         * so the next recv'd beacon's TSF will be used to sync the 
    30 @@ -9204,6 +9204,7 @@ 
     30@@ -9295,6 +9295,7 @@ 
    3131                } 
    3232  
  • trunk/package/madwifi/patches/311-bssid_alloc.patch

    r10259 r10511  
    1 Index: madwifi-dfs-r3246/ath/if_ath.c 
     1Index: madwifi-trunk-r3314/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-dfs-r3246.orig/ath/if_ath.c 2008-01-25 16:37:38.479506279 +0100 
    4 +++ madwifi-dfs-r3246/ath/if_ath.c      2008-01-25 16:38:04.684999652 +0100 
    5 @@ -1345,7 +1345,7 @@ 
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 21:57:55.057877957 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 21:57:58.494073773 +0100 
     5@@ -1351,7 +1351,7 @@ 
    66                TAILQ_FOREACH(v, &ic->ic_vaps, iv_next) 
    77                        id_mask |= (1 << ATH_GET_VAP_ID(v->iv_myaddr)); 
  • trunk/package/madwifi/patches/312-erpupdate.patch

    r10294 r10511  
    1 Index: madwifi-trunk-r3280/net80211/ieee80211_beacon.c 
     1Index: madwifi-trunk-r3314/net80211/ieee80211_beacon.c 
    22=================================================================== 
    3 --- madwifi-trunk-r3280.orig/net80211/ieee80211_beacon.c        2008-01-28 17:27:08.000000000 +0100 
    4 +++ madwifi-trunk-r3280/net80211/ieee80211_beacon.c     2008-01-28 17:32:30.587778482 +0100 
     3--- madwifi-trunk-r3314.orig/net80211/ieee80211_beacon.c        2008-02-20 18:10:45.515108151 +0100 
     4+++ madwifi-trunk-r3314/net80211/ieee80211_beacon.c     2008-02-20 18:10:50.491391734 +0100 
    55@@ -542,10 +542,10 @@ 
    66                        vap->iv_flags &= ~IEEE80211_F_XRUPDATE; 
     
    1616        } 
    1717        /* if it is a mode change beacon for dynamic turbo case */ 
    18 Index: madwifi-trunk-r3280/net80211/ieee80211_input.c 
     18Index: madwifi-trunk-r3314/net80211/ieee80211_input.c 
    1919=================================================================== 
    20 --- madwifi-trunk-r3280.orig/net80211/ieee80211_input.c 2008-01-28 17:30:33.905937066 +0100 
    21 +++ madwifi-trunk-r3280/net80211/ieee80211_input.c      2008-01-28 17:31:42.836941957 +0100 
    22 @@ -3423,9 +3423,12 @@ 
     20--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-02-20 18:10:49.723347963 +0100 
     21+++ madwifi-trunk-r3314/net80211/ieee80211_input.c      2008-02-20 18:10:50.495391960 +0100 
     22@@ -3431,9 +3431,12 @@ 
    2323                        /* Assume no ERP IE == 11b AP */ 
    2424                        if ((!has_erp || (has_erp && (scan.erp & IEEE80211_ERP_NON_ERP_PRESENT))) && 
     
    3434                } 
    3535  
    36 Index: madwifi-trunk-r3280/net80211/ieee80211_node.c 
     36Index: madwifi-trunk-r3314/net80211/ieee80211_node.c 
    3737=================================================================== 
    38 --- madwifi-trunk-r3280.orig/net80211/ieee80211_node.c  2008-01-28 17:30:34.525972400 +0100 
    39 +++ madwifi-trunk-r3280/net80211/ieee80211_node.c       2008-01-28 17:31:42.844938410 +0100 
    40 @@ -2021,8 +2021,12 @@ 
     38--- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c  2008-02-20 18:10:49.727348192 +0100 
     39+++ madwifi-trunk-r3314/net80211/ieee80211_node.c       2008-02-20 18:10:50.507392644 +0100 
     40@@ -2022,8 +2022,12 @@ 
    4141                } 
    4242  
     
    5353                ni->ni_flags |= IEEE80211_NODE_ERP; 
    5454 } 
    55 @@ -2225,6 +2229,8 @@ 
     55@@ -2226,6 +2230,8 @@ 
    5656                IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni, 
    5757                        "non-ERP station leaves, count now %d", ic->ic_nonerpsta); 
     
    6262                                "%s: disable use of protection\n", __func__); 
    6363                        ic->ic_flags &= ~IEEE80211_F_USEPROT; 
    64 @@ -2236,7 +2242,9 @@ 
     64@@ -2237,7 +2243,9 @@ 
    6565                                ic->ic_flags |= IEEE80211_F_SHPREAMBLE; 
    6666                                ic->ic_flags &= ~IEEE80211_F_USEBARKER; 
  • trunk/package/madwifi/patches/317-bmask.patch

    r10268 r10511  
    1 Index: madwifi-dfs-r3252/ath/if_ath.c 
     1Index: madwifi-trunk-r3314/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-dfs-r3252.orig/ath/if_ath.c 2008-01-26 05:46:05.078738026 +0100 
    4 +++ madwifi-dfs-r3252/ath/if_ath.c      2008-01-26 05:46:09.658999042 +0100 
    5 @@ -8626,6 +8626,10 @@ 
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 21:57:58.494073773 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 21:58:14.318975583 +0100 
     5@@ -8673,6 +8673,10 @@ 
    66  
    77        sc->sc_rxbufcur = NULL; 
  • trunk/package/madwifi/patches/318-minstrel_mrr.patch

    r10269 r10511  
    1 Index: madwifi-dfs-r3252/ath_rate/minstrel/minstrel.c 
     1Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c 
    22=================================================================== 
    3 --- madwifi-dfs-r3252.orig/ath_rate/minstrel/minstrel.c 2008-01-26 03:42:00.155571408 +0100 
    4 +++ madwifi-dfs-r3252/ath_rate/minstrel/minstrel.c      2008-01-26 05:55:24.107535577 +0100 
     3--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c       2008-02-20 18:10:48.795295077 +0100 
     4+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c    2008-02-20 18:10:50.951417946 +0100 
    55@@ -328,7 +328,7 @@ 
    66                            return; 
  • trunk/package/madwifi/patches/323-dfs_optional.patch

    r10294 r10511  
    1 Index: madwifi-trunk-r3280/ath/if_ath.c 
     1Index: madwifi-trunk-r3314/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-trunk-r3280.orig/ath/if_ath.c       2008-01-28 18:17:03.786862678 +0100 
    4 +++ madwifi-trunk-r3280/ath/if_ath.c    2008-01-28 18:21:43.162783406 +0100 
    5 @@ -1754,17 +1754,14 @@ 
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 21:58:51.885116355 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 21:58:53.697219623 +0100 
     5@@ -1771,17 +1771,14 @@ 
    66                         * may have occurred in the intervening timeframe. */ 
    77                        bf->bf_channoise = ic->ic_channoise; 
     
    2828                        /* Prepare wireless header for examination */ 
    2929                        bus_dma_sync_single(sc->sc_bdev, bf->bf_skbaddr, 
    30 Index: madwifi-trunk-r3280/ath/if_ath_radar.c 
     30Index: madwifi-trunk-r3314/ath/if_ath_radar.c 
    3131=================================================================== 
    32 --- madwifi-trunk-r3280.orig/ath/if_ath_radar.c 2008-01-28 18:20:47.859631857 +0100 
    33 +++ madwifi-trunk-r3280/ath/if_ath_radar.c      2008-01-28 18:20:50.915806019 +0100 
    34 @@ -265,7 +265,7 @@ 
     32--- madwifi-trunk-r3314.orig/ath/if_ath_radar.c 2008-02-20 21:58:35.060157557 +0100 
     33+++ madwifi-trunk-r3314/ath/if_ath_radar.c      2008-02-20 21:58:53.701219858 +0100 
     34@@ -263,7 +263,7 @@ 
    3535                unsigned int new_rxfilt = old_rxfilt; 
    3636  
  • trunk/package/madwifi/patches/324-alignment.patch

    r10334 r10511  
    11Index: madwifi-trunk-r3314/net80211/ieee80211_input.c 
    22=================================================================== 
    3 --- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-01-31 03:33:26.665309039 +0100 
    4 +++ madwifi-trunk-r3314/net80211/ieee80211_input.c      2008-01-31 03:38:55.116026377 +0100 
     3--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-02-20 18:10:50.495391960 +0100 
     4+++ madwifi-trunk-r3314/net80211/ieee80211_input.c      2008-02-20 18:10:51.395443250 +0100 
    55@@ -1275,14 +1275,8 @@ 
    66                eh->ether_type = ether_type; 
  • trunk/package/madwifi/patches/325-channel_spam.patch

    r10294 r10511  
    1 Index: madwifi-trunk-r3280/ath/if_ath.c 
     1Index: madwifi-trunk-r3314/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-trunk-r3280.orig/ath/if_ath.c       2008-01-28 19:00:13.666420256 +0100 
    4 +++ madwifi-trunk-r3280/ath/if_ath.c    2008-01-28 19:01:05.093350913 +0100 
    5 @@ -9701,7 +9701,9 @@ 
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 21:58:53.697219623 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 21:58:58.545495909 +0100 
     5@@ -9776,7 +9776,9 @@ 
    66        /* 
    77         * Convert HAL channels to ieee80211 ones. 
     
    1313                HAL_CHANNEL *c = &chans[i]; 
    1414                struct ieee80211_channel *ichan = &ic->ic_channels[i]; 
    15 @@ -9728,6 +9730,7 @@ 
     15@@ -9803,6 +9805,7 @@ 
    1616                ic->ic_chan_non_occupy[i].tv_sec  = 0; 
    1717                ic->ic_chan_non_occupy[i].tv_usec = 0; 
     
    2121                                "[%d hw %d reg] Flags%s%s%s%s%s%s%s%s%s%s%s%s%" 
    2222                                "s%s%s%s%s%s%s%s%s%s%s%s\n", 
    23 @@ -9816,6 +9819,7 @@ 
     23@@ -9891,6 +9894,7 @@ 
    2424                                (c->privFlags & 0x0080 ?  
    2525                                 " PF & (1 << 7)" : "") 
  • trunk/package/madwifi/patches/327-queue.patch

    r10334 r10511  
    11Index: madwifi-trunk-r3314/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-01-31 03:39:02.140426675 +0100 
    4 +++ madwifi-trunk-r3314/ath/if_ath.c    2008-01-31 03:39:41.360481823 +0100 
    5 @@ -8357,8 +8357,6 @@ 
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 21:58:58.545495909 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 21:59:01.609670527 +0100 
     5@@ -8423,8 +8423,6 @@ 
    66        ath_hal_intrset(sc->sc_ah, sc->sc_imask); 
    77        local_irq_restore(flags); 
     
    1212                ath_led_event(sc, ATH_LED_TX); 
    1313 } 
    14 @@ -8405,8 +8403,6 @@ 
     14@@ -8471,8 +8469,6 @@ 
    1515        ath_hal_intrset(sc->sc_ah, sc->sc_imask); 
    1616        local_irq_restore(flags); 
     
    2121                ath_led_event(sc, ATH_LED_TX); 
    2222 } 
    23 @@ -8439,8 +8435,6 @@ 
     23@@ -8505,8 +8501,6 @@ 
    2424        ath_hal_intrset(sc->sc_ah, sc->sc_imask); 
    2525        local_irq_restore(flags); 
     
    3232Index: madwifi-trunk-r3314/net80211/ieee80211_input.c 
    3333=================================================================== 
    34 --- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-01-31 03:38:55.116026377 +0100 
    35 +++ madwifi-trunk-r3314/net80211/ieee80211_input.c      2008-01-31 03:39:41.364480053 +0100 
     34--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-02-20 21:58:57.425432087 +0100 
     35+++ madwifi-trunk-r3314/net80211/ieee80211_input.c      2008-02-20 21:59:01.613670756 +0100 
    3636@@ -1132,7 +1132,7 @@ 
    3737            (vap->iv_flags & IEEE80211_F_NOBRIDGE) == 0) { 
  • trunk/package/madwifi/patches/328-ani_stuff.patch

    r10334 r10511  
    11Index: madwifi-trunk-r3314/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-01-31 03:59:25.474330368 +0100 
    4 +++ madwifi-trunk-r3314/ath/if_ath.c    2008-01-31 04:00:30.254021949 +0100 
    5 @@ -6686,8 +6686,9 @@ 
    6   
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 21:59:01.609670527 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 21:59:04.037808900 +0100 
     5@@ -6752,8 +6752,9 @@ 
    76        *budget -= processed; 
     7 #endif 
    88  
    99-       /* rx signal state monitoring */ 
  • trunk/package/madwifi/patches/330-beaconcal.patch

    r10505 r10511  
    11Index: madwifi-trunk-r3314/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-17 18:37:14.134402305 +0100 
    4 +++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-17 22:09:52.078681699 +0100 
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 21:59:04.037808900 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 21:59:07.426001981 +0100 
    55@@ -395,6 +395,7 @@ 
    66 static int maxvaps = -1; 
     
    101101                ath_beacon_dturbo_config(vap, intval & 
    102102                                ~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA)); 
    103 @@ -8865,6 +8895,9 @@ 
     103@@ -8864,6 +8894,9 @@ 
    104104                        /* Enter DFS wait period */ 
    105105                        mod_timer(&sc->sc_dfs_cac_timer, 
     
    111111                /* 
    112112                 * re configure beacons when it is a turbo mode switch. 
    113 @@ -8974,8 +9007,11 @@ 
     113@@ -8973,8 +9006,11 @@ 
    114114                sc->sc_curchan.channel, sc->sc_curchan.channelFlags, 
    115115                isIQdone ? "done" : "not done"); 
     
    125125  
    126126 static void 
    127 @@ -9082,7 +9118,8 @@ 
     127@@ -9081,7 +9117,8 @@ 
    128128                ieee80211_state_name[vap->iv_state], 
    129129                ieee80211_state_name[nstate]); 
     
    135135        ath_hal_setledstate(ah, leds[nstate]);  /* set LED */ 
    136136        netif_stop_queue(dev);                  /* before we do anything else */ 
    137 @@ -9307,7 +9344,8 @@ 
     137@@ -9306,7 +9343,8 @@ 
    138138                                "VAP -> DFSWAIT_PENDING \n"); 
    139139                        /* start calibration timer with a really small value  
     
    145145                        netif_wake_queue(dev); 
    146146                        /* don't do the other usual stuff... */ 
    147 @@ -9350,7 +9388,7 @@ 
     147@@ -9349,7 +9387,7 @@ 
    148148        error = avp->av_newstate(vap, nstate, arg); 
    149149  
     
    156156Index: madwifi-trunk-r3314/ath/if_athvar.h 
    157157=================================================================== 
    158 --- madwifi-trunk-r3314.orig/ath/if_athvar.h    2008-02-17 18:37:14.134402305 +0100 
    159 +++ madwifi-trunk-r3314/ath/if_athvar.h 2008-02-17 22:08:35.966344301 +0100 
     158--- madwifi-trunk-r3314.orig/ath/if_athvar.h    2008-02-20 21:58:38.148333545 +0100 
     159+++ madwifi-trunk-r3314/ath/if_athvar.h 2008-02-20 21:59:07.426001981 +0100 
    160160@@ -778,6 +778,8 @@ 
    161161        struct ieee80211vap **sc_bslot;         /* beacon xmit slots */ 
  • trunk/package/madwifi/patches/331-memory_alloc.patch

    r10417 r10511  
    11Index: madwifi-trunk-r3314/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-08 04:11:11.775823441 +0100 
    4 +++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-08 05:46:16.761139918 +0100 
    5 @@ -3308,17 +3308,18 @@ 
     3--- madwifi-trunk-r3314.orig/ath/if_ath.c       2008-02-20 18:10:52.499506168 +0100 
     4+++ madwifi-trunk-r3314/ath/if_ath.c    2008-02-20 18:10:52.731519391 +0100 
     5@@ -3315,17 +3315,18 @@ 
    66         * without affecting any other bridge ports. */ 
    77        if (skb_cloned(skb)) { 
     
    2828  
    2929 #ifdef ATH_SUPERG_FF 
    30 @@ -3584,11 +3585,13 @@ 
     30@@ -3591,11 +3592,13 @@ 
    3131         */ 
    3232        error = ath_tx_start(dev, SKB_CB(skb)->ni, bf, skb, 0); 
Note: See TracChangeset for help on using the changeset viewer.