fix madwifi compile for 2.4

[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 d808bfb..5aae795 100644 (file)
--- a/package/madwifi/patches/120-soc_fix.patch
+++ b/package/madwifi/patches/120-soc_fix.patch
@@ -1,6 +1,7 @@
-diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/ath/if_ath_ahb.c
---- madwifi.old/ath/if_ath_ahb.c       2007-05-30 03:41:18.000000000 +0200
-+++ madwifi.dev/ath/if_ath_ahb.c       2007-06-01 12:04:02.887273960 +0200
+Index: madwifi-ng-r2525-20070630/ath/if_ath_ahb.c
+===================================================================
+--- madwifi-ng-r2525-20070630.orig/ath/if_ath_ahb.c    2007-07-03 23:02:25.509638000 +0200
++++ madwifi-ng-r2525-20070630/ath/if_ath_ahb.c 2007-07-03 23:02:30.709963000 +0200
 @@ -275,11 +275,10 @@
  
  
@@ -42,26 +43,3 @@ diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/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: