refresh madwifi patches

[openwrt/openwrt.git] / package / madwifi / patches / 120-soc_fix.patch

diff --git a/package/madwifi/patches/120-soc_fix.patch b/package/madwifi/patches/120-soc_fix.patch
index 067dbfbb1c081a50848cd1897deb3dcc2ba39296..cd4486f378c105399ec9b674200a0b74256be8a2 100644 (file)
--- a/package/madwifi/patches/120-soc_fix.patch
+++ b/package/madwifi/patches/120-soc_fix.patch
@@ -1,7 +1,7 @@
-Index: madwifi-ng-r2420-20070602/ath/if_ath_ahb.c
+Index: madwifi-ng-r2568-20070710/ath/if_ath_ahb.c
 ===================================================================
---- madwifi-ng-r2420-20070602.orig/ath/if_ath_ahb.c    2007-06-04 13:21:53.320870664 +0200
-+++ madwifi-ng-r2420-20070602/ath/if_ath_ahb.c 2007-06-04 13:21:57.306264792 +0200
+--- madwifi-ng-r2568-20070710.orig/ath/if_ath_ahb.c    2007-07-13 11:18:13.881087584 +0200
++++ madwifi-ng-r2568-20070710/ath/if_ath_ahb.c 2007-07-13 11:18:17.461291609 +0200
 @@ -275,11 +275,10 @@
  
  
@@ -15,14 +15,15 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath_ahb.c
        u_int16_t devid;
  
        if (sc == NULL)
-@@ -289,13 +288,16 @@
+@@ -289,13 +288,17 @@
        ath_detach(dev);
        if (dev->irq)
                free_irq(dev->irq, dev);
 -      sysType = get_system_type();
 -      if (!strcmp(sysType, "Atheros AR5315"))
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+      devid = (u32) config->tag;
++      devid = sc->aps_sc.devid;
++      config->tag = (unsigned long) devid;
 +#else
 +      if (!strcmp(get_system_type(), "Atheros AR5315"))
                devid = (u_int16_t) (sysRegRead(AR5315_SREV) &
@@ -34,7 +35,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath_ahb.c
  
        ahb_disable_wmac(devid, wlanNum);
        free_netdev(dev);
-@@ -401,7 +403,7 @@
+@@ -401,7 +404,7 @@
  
  static int ahb_wmac_remove(struct platform_device *pdev)
  {
@@ -43,26 +44,3 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath_ahb.c
  
        return 0;
  }
-@@ -439,7 +441,7 @@
-                       (AR5315_REV_MAJ_M | AR5315_REV_MIN_M));
-               if (((devid & AR5315_REV_MAJ_M) == AR5315_REV_MAJ) ||
-                       ((devid & AR5315_REV_MAJ_M) == AR5317_REV_MAJ))
--                      return init_ath_wmac(devid, 0, &config);
-+                      return init_ath_wmac(devid, 0);
-       }
- 
-       devid = (u_int16_t) ((sysRegRead(AR531X_REV) >>8) &
-@@ -452,11 +454,11 @@
-               ar5312BspEepromRead(2 * AR531X_RADIO_MASK_OFF, 2,
-                       (char *) &radioMask);
-               if ((radioMask & AR531X_RADIO0_MASK) != 0)
--                      if ((ret = init_ath_wmac(devid, 0, &config)) !=0 )
-+                      if ((ret = init_ath_wmac(devid, 0)) !=0 )
-                               return ret;
-               /* XXX: Fall through?! */
-       case AR5212_AR2313_REV8:
--              if ((ret = init_ath_wmac(devid, 1, &config)) != 0)
-+              if ((ret = init_ath_wmac(devid, 1)) != 0)
-                       return ret;
-               break;
-       default: