Changeset 10334


Ignore:
Timestamp:
2008-01-31T05:09:54+01:00 (10 years ago)
Author:
nbd
Message:

pull madwifi forward to the latest upstream version - should fix some dual radio issues; add preliminary 2.6.24 support patch (compiles, not run-time tested, thx SeG)

Location:
trunk/package/madwifi
Files:
2 added
8 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/madwifi/Makefile

    r10294 r10334  
    1111 
    1212PKG_NAME:=madwifi 
    13 PKG_REV:=3280 
     13PKG_REV:=3314 
    1414PKG_VERSION:=r$(PKG_REV) 
    1515# PKG_BRANCH:=madwifi-dfs 
  • trunk/package/madwifi/patches/124-linux24_compat.patch

    r10259 r10334  
    1 Index: madwifi-dfs-r3252/ath/if_athvar.h 
    2 =================================================================== 
    3 --- madwifi-dfs-r3252.orig/ath/if_athvar.h      2008-01-25 21:13:50.832747032 +0100 
    4 +++ madwifi-dfs-r3252/ath/if_athvar.h   2008-01-25 21:14:09.785827106 +0100 
    5 @@ -128,6 +128,11 @@ 
    6  #define        NETDEV_TX_BUSY  1 
     1Index: madwifi-trunk-r3314/ath/if_athvar.h 
     2=================================================================== 
     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 
     5@@ -126,6 +126,11 @@ 
     6 #define ATH_GET_NETDEV_DEV(ndev)       ((ndev)->class_dev.dev) 
    77 #endif 
    88  
     
    1515 static inline struct net_device *_alloc_netdev(int sizeof_priv, const char *mask, 
    1616                                               void (*setup)(struct net_device *)) 
    17 Index: madwifi-dfs-r3252/ath/if_ath_radar.c 
    18 =================================================================== 
    19 --- madwifi-dfs-r3252.orig/ath/if_ath_radar.c   2008-01-25 21:13:50.840747487 +0100 
    20 +++ madwifi-dfs-r3252/ath/if_ath_radar.c        2008-01-25 21:14:09.789827335 +0100 
     17Index: madwifi-trunk-r3314/ath/if_ath_radar.c 
     18=================================================================== 
     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 
    2121@@ -92,6 +92,13 @@ 
    2222 #define nofloat_pct(_value, _pct) \ 
     
    3333        /* The name of the rule/specification (i.e. what did we detect) */ 
    3434        const char *name; 
    35 Index: madwifi-dfs-r3252/ath/if_ath.c 
    36 =================================================================== 
    37 --- madwifi-dfs-r3252.orig/ath/if_ath.c 2008-01-25 21:13:59.245226430 +0100 
    38 +++ madwifi-dfs-r3252/ath/if_ath.c      2008-01-25 21:14:09.797827791 +0100 
    39 @@ -4698,6 +4698,46 @@ 
     35Index: madwifi-trunk-r3314/ath/if_ath.c 
     36=================================================================== 
     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 
     39@@ -4705,6 +4705,46 @@ 
    4040 #undef USE_SHPREAMBLE 
    4141 } 
     
    8484  * Generate beacon frame and queue cab data for a VAP. 
    8585  */ 
    86 Index: madwifi-dfs-r3252/net80211/ieee80211_scan_ap.c 
    87 =================================================================== 
    88 --- madwifi-dfs-r3252.orig/net80211/ieee80211_scan_ap.c 2008-01-25 21:13:50.852748172 +0100 
    89 +++ madwifi-dfs-r3252/net80211/ieee80211_scan_ap.c      2008-01-25 21:14:33.343169561 +0100 
    90 @@ -46,7 +46,12 @@ 
    91  #include <linux/netdevice.h> 
    92  #include <linux/init.h> 
    93  #include <linux/delay.h> 
    94 + 
    95 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) 
    96 +#include "sort.c" 
    97 +#else 
    98  #include <linux/sort.h> 
    99 +#endif 
    100   
    101  #include "if_media.h" 
    102   
    103 Index: madwifi-dfs-r3252/net80211/sort.c 
     86Index: madwifi-trunk-r3314/net80211/sort.c 
    10487=================================================================== 
    10588--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    106 +++ madwifi-dfs-r3252/net80211/sort.c   2008-01-25 21:14:09.801828016 +0100 
     89+++ madwifi-trunk-r3314/net80211/sort.c 2008-01-31 03:31:07.717390845 +0100 
    10790@@ -0,0 +1,120 @@ 
    10891+/* 
  • trunk/package/madwifi/patches/324-alignment.patch

    r10294 r10334  
    1 Index: madwifi-trunk-r3280/net80211/ieee80211_input.c 
     1Index: madwifi-trunk-r3314/net80211/ieee80211_input.c 
    22=================================================================== 
    3 --- madwifi-trunk-r3280.orig/net80211/ieee80211_input.c 2008-01-28 18:38:05.794780412 +0100 
    4 +++ madwifi-trunk-r3280/net80211/ieee80211_input.c      2008-01-28 18:38:21.835694529 +0100 
    5 @@ -1279,17 +1279,8 @@ 
     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 
     5@@ -1275,14 +1275,8 @@ 
    66                eh->ether_type = ether_type; 
    77  
     
    1111-               /* XXX: does this always work? */ 
    1212-               tskb = skb_copy(skb, GFP_ATOMIC); 
    13 -               if (!tskb) 
    14 -                       return skb; 
    15 - 
    16 -               /* We duplicate the reference after skb_copy */ 
    17 -               ieee80211_skb_copy_noderef(skb, tskb); 
     13-               if (tskb) 
     14-                       ieee80211_skb_copy_noderef(skb, tskb); 
    1815-               ieee80211_dev_kfree_skb(&skb); 
    1916-               skb = tskb; 
  • trunk/package/madwifi/patches/327-queue.patch

    r10312 r10334  
    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-29 17:57:02.738327980 +0100 
    4 +++ madwifi-trunk-r3280/ath/if_ath.c    2008-01-29 17:57:02.770329801 +0100 
    5 @@ -8336,8 +8336,6 @@ 
     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 @@ 
    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 @@ -8384,8 +8382,6 @@ 
     14@@ -8405,8 +8403,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 @@ -8418,8 +8414,6 @@ 
     23@@ -8439,8 +8435,6 @@ 
    2424        ath_hal_intrset(sc->sc_ah, sc->sc_imask); 
    2525        local_irq_restore(flags); 
     
    3030                ath_led_event(sc, ATH_LED_TX); 
    3131 } 
    32 Index: madwifi-trunk-r3280/net80211/ieee80211_input.c 
     32Index: madwifi-trunk-r3314/net80211/ieee80211_input.c 
    3333=================================================================== 
    34 --- madwifi-trunk-r3280.orig/net80211/ieee80211_input.c 2008-01-29 17:57:29.147832972 +0100 
    35 +++ madwifi-trunk-r3280/net80211/ieee80211_input.c      2008-01-29 17:58:27.315147737 +0100 
    36 @@ -1136,7 +1136,7 @@ 
     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 
     36@@ -1132,7 +1132,7 @@ 
    3737            (vap->iv_flags & IEEE80211_F_NOBRIDGE) == 0) { 
    3838                struct sk_buff *skb1 = NULL; 
Note: See TracChangeset for help on using the changeset viewer.