X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c3360bcbb3ee920a86c38de88b355bdbfd70de92..437677dfb4af6042196c1cd57e5d8549f23db7b5:/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 d808bfbfa..41a5fbb07 100644
--- 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-r2568-20070710/ath/if_ath_ahb.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/ath/if_ath_ahb.c	2007-07-23 01:48:38.098151260 +0200
++++ madwifi-ng-r2568-20070710/ath/if_ath_ahb.c	2007-07-23 01:48:41.998373519 +0200
 @@ -275,11 +275,10 @@
  
  
@@ -14,14 +15,15 @@ diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/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) &
@@ -33,7 +35,7 @@ diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/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)
  {
@@ -42,26 +44,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: