clean up the madwifi SoC support patch - remove some breakage that went unnoticed...
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 28 Jun 2007 00:01:11 +0000 (00:01 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 28 Jun 2007 00:01:11 +0000 (00:01 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7746 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/madwifi/patches/120-soc_fix.patch

index 067dbfbb1c081a50848cd1897deb3dcc2ba39296..fd3a2007999ed4468b4b8f0dc5299fb3e76ebb81 100644 (file)
@@ -43,26 +43,4 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath_ahb.c
  
        return 0;
  }
  
        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:
+