openwrt-xburst/package/madwifi/patches/120-soc_fix.patch

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 @@
 
 
 static int
-exit_ath_wmac(u_int16_t wlanNum)
+exit_ath_wmac(u_int16_t wlanNum, struct ar531x_config *config)
 {
 	struct ath_ahb_softc *sc = sclist[wlanNum];
 	struct net_device *dev;
-	const char *sysType;
 	u_int16_t devid;
 
 	if (sc == NULL)
@@ -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 = sc->aps_sc.devid;
+	config->tag = (unsigned long) devid;
+#else
+	if (!strcmp(get_system_type(), "Atheros AR5315"))
 		devid = (u_int16_t) (sysRegRead(AR5315_SREV) &
 			(AR5315_REV_MAJ_M | AR5315_REV_MIN_M));
 	else
 		devid = (u_int16_t) ((sysRegRead(AR531X_REV) >> 8) &
 			(AR531X_REV_MAJ | AR531X_REV_MIN));
+#endif
 
 	ahb_disable_wmac(devid, wlanNum);
 	free_netdev(dev);
@@ -401,7 +404,7 @@
 
 static int ahb_wmac_remove(struct platform_device *pdev)
 {
-	exit_ath_wmac(pdev->id);
+	exit_ath_wmac(pdev->id, (struct ar531x_config *) pdev->dev.platform_data);
 
 	return 0;
 }