merge madwifi and wprobe into 8.09

[openwrt/svn-archive/archive.git] / package / madwifi / patches / 434-name-alloc-fix.patch

diff --git a/package/madwifi/patches/434-name-alloc-fix.patch b/package/madwifi/patches/434-name-alloc-fix.patch
index b3bb30067ac73cf3b9cf58592c96ae41cc6de98d..ab277630de60de599add6dc1081f6238d39e3b94 100644 (file)
--- a/package/madwifi/patches/434-name-alloc-fix.patch
+++ b/package/madwifi/patches/434-name-alloc-fix.patch
@@ -1,7 +1,6 @@
-diff -ur madwifi-trunk-r3314/ath/if_ath_ahb.c madwifi-trunk-r3314.patched/ath/if_ath_ahb.c
---- madwifi-trunk-r3314/ath/if_ath_ahb.c       2009-05-17 22:16:05.000000000 +0300
-+++ madwifi-trunk-r3314.patched/ath/if_ath_ahb.c       2009-05-17 22:15:47.000000000 +0300
-@@ -376,6 +376,11 @@
+--- a/ath/if_ath_ahb.c
++++ b/ath/if_ath_ahb.c
+@@ -311,6 +311,11 @@ init_ath_wmac(u_int16_t devid, u_int16_t
        SET_MODULE_OWNER(dev);
        sclist[wlanNum] = sc;
  
@@ -13,10 +12,9 @@ diff -ur madwifi-trunk-r3314/ath/if_ath_ahb.c madwifi-trunk-r3314.patched/ath/if
        switch (wlanNum) {
        case AR531X_WLAN0_NUM:
                if (((devid & AR5315_REV_MAJ_M) == AR5315_REV_MAJ) ||
-diff -ur madwifi-trunk-r3314/ath/if_ath_pci.c madwifi-trunk-r3314.patched/ath/if_ath_pci.c
---- madwifi-trunk-r3314/ath/if_ath_pci.c       2009-05-17 22:16:05.000000000 +0300
-+++ madwifi-trunk-r3314.patched/ath/if_ath_pci.c       2009-05-17 22:15:47.000000000 +0300
-@@ -209,6 +209,11 @@
+--- a/ath/if_ath_pci.c
++++ b/ath/if_ath_pci.c
+@@ -236,6 +236,11 @@ ath_pci_probe(struct pci_dev *pdev, cons
         */
        sc->aps_sc.sc_invalid = 1;