2007-06-04 11:25:53 +00:00
|
|
|
Index: madwifi-ng-r2420-20070602/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
|
2007-06-01 10:29:49 +00:00
|
|
|
@@ -275,11 +275,10 @@
|
2007-05-13 16:24:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
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;
|
2007-06-01 10:29:49 +00:00
|
|
|
u_int16_t devid;
|
2007-05-13 16:24:11 +00:00
|
|
|
|
|
|
|
|
if (sc == NULL)
|
2007-06-01 10:30:35 +00:00
|
|
|
@@ -289,13 +288,16 @@
|
|
|
|
|
ath_detach(dev);
|
2007-05-13 16:24:11 +00:00
|
|
|
if (dev->irq)
|
|
|
|
|
free_irq(dev->irq, dev);
|
2007-06-01 10:30:35 +00:00
|
|
|
- sysType = get_system_type();
|
2007-05-13 16:24:11 +00:00
|
|
|
- if (!strcmp(sysType, "Atheros AR5315"))
|
|
|
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
|
|
|
|
|
+ devid = (u32) config->tag;
|
|
|
|
|
+#else
|
|
|
|
|
+ if (!strcmp(get_system_type(), "Atheros AR5315"))
|
|
|
|
|
devid = (u_int16_t) (sysRegRead(AR5315_SREV) &
|
|
|
|
|
(AR5315_REV_MAJ_M | AR5315_REV_MIN_M));
|
|
|
|
|
else
|
2007-06-01 10:29:49 +00:00
|
|
|
devid = (u_int16_t) ((sysRegRead(AR531X_REV) >> 8) &
|
2007-05-13 16:24:11 +00:00
|
|
|
(AR531X_REV_MAJ | AR531X_REV_MIN));
|
|
|
|
|
+#endif
|
2007-06-01 10:29:49 +00:00
|
|
|
|
2007-05-13 16:24:11 +00:00
|
|
|
ahb_disable_wmac(devid, wlanNum);
|
|
|
|
|
free_netdev(dev);
|
2007-06-01 10:30:35 +00:00
|
|
|
@@ -401,7 +403,7 @@
|
2007-05-13 16:24:11 +00:00
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
2007-06-01 10:30:35 +00:00
|
|
|
@@ -439,7 +441,7 @@
|
2007-05-13 16:24:11 +00:00
|
|
|
(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) &
|
2007-06-01 10:30:35 +00:00
|
|
|
@@ -452,11 +454,11 @@
|
2007-05-13 16:24:11 +00:00
|
|
|
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:
|
