diff options
Diffstat (limited to 'package/madwifi/patches/120-soc_fix.patch')
| -rw-r--r-- | package/madwifi/patches/120-soc_fix.patch | 51 |
1 files changed, 9 insertions, 42 deletions
diff --git a/package/madwifi/patches/120-soc_fix.patch b/package/madwifi/patches/120-soc_fix.patch index d4a9a68..feebf3f 100644 --- a/package/madwifi/patches/120-soc_fix.patch +++ b/package/madwifi/patches/120-soc_fix.patch @@ -1,11 +1,9 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath_ahb.c madwifi-ng-r2377-20070526.dev/ath/if_ath_ahb.c --- madwifi-ng-r2377-20070526.old/ath/if_ath_ahb.c 2007-02-24 02:33:54.000000000 +0100 +++ madwifi-ng-r2377-20070526.dev/ath/if_ath_ahb.c 2007-05-26 18:51:09.112702200 +0200 -@@ -274,12 +274,12 @@ - } +@@ -275,11 +275,10 @@ -+ static int -exit_ath_wmac(u_int16_t wlanNum) +exit_ath_wmac(u_int16_t wlanNum, struct ar531x_config *config) @@ -13,16 +11,14 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath_ahb.c madwifi-ng-r2377-200705 struct ath_ahb_softc *sc = sclist[wlanNum]; struct net_device *dev; - const char *sysType; - u_int16_t devid; + u_int16_t devid; if (sc == NULL) -@@ -289,13 +289,17 @@ - ath_detach(dev); +@@ -290,12 +289,16 @@ if (dev->irq) free_irq(dev->irq, dev); -- sysType = get_system_type(); + sysType = get_system_type(); - if (!strcmp(sysType, "Atheros AR5315")) -+ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) + devid = (u32) config->tag; +#else @@ -30,13 +26,13 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath_ahb.c madwifi-ng-r2377-200705 devid = (u_int16_t) (sysRegRead(AR5315_SREV) & (AR5315_REV_MAJ_M | AR5315_REV_MIN_M)); else - devid = (u_int16_t) ((sysRegRead(AR531X_REV) >> 8) & + 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 +405,7 @@ +@@ -401,7 +404,7 @@ static int ahb_wmac_remove(struct platform_device *pdev) { @@ -45,7 +41,7 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath_ahb.c madwifi-ng-r2377-200705 return 0; } -@@ -439,7 +443,7 @@ +@@ -439,7 +442,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)) @@ -54,7 +50,7 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath_ahb.c madwifi-ng-r2377-200705 } devid = (u_int16_t) ((sysRegRead(AR531X_REV) >>8) & -@@ -452,11 +456,11 @@ +@@ -452,11 +455,11 @@ ar5312BspEepromRead(2 * AR531X_RADIO_MASK_OFF, 2, (char *) &radioMask); if ((radioMask & AR531X_RADIO0_MASK) != 0) @@ -68,32 +64,3 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath_ahb.c madwifi-ng-r2377-200705 return ret; break; default: -diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c ---- madwifi-ng-r2377-20070526.old/ath/if_ath.c 2007-05-26 18:51:09.019716336 +0200 -+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c 2007-05-26 18:51:09.116701592 +0200 -@@ -7636,9 +7636,24 @@ - DPRINTF(sc, ATH_DEBUG_RESET, "%s: beacon queue 0x%x\n", - __func__, ath_hal_gettxbuf(ah, sc->sc_bhalq)); - for (i = 0; i < HAL_NUM_TX_QUEUES; i++) -- if (ATH_TXQ_SETUP(sc, i)) -+ if (ATH_TXQ_SETUP(sc, i)) { - ath_tx_stopdma(sc, &sc->sc_txq[i]); -+ -+ /* The TxDMA may not really be stopped. -+ * Double check the hal tx pending count */ -+ npend += ath_hal_numtxpending(ah, sc->sc_txq[i].axq_qnum); -+ } - } -+ -+ if (npend) { -+ HAL_STATUS status; -+ -+ /* TxDMA not stopped, reset the hal */ -+ DPRINTF(sc, ATH_DEBUG_RESET, "%s: Unable to stop TxDMA. Reset HAL!\n", __func__); -+ if (!ath_hal_reset(ah, sc->sc_ic.ic_opmode, &sc->sc_curchan, AH_TRUE, &status)) -+ printk("%s: unable to reset hardware; hal status %u\n", __func__, status); -+ } -+ - sc->sc_dev->trans_start = jiffies; - netif_start_queue(sc->sc_dev); /* XXX move to callers */ - for (i = 0; i < HAL_NUM_TX_QUEUES; i++) |