From 1ac39b821237914b9d7210fdaf682561ed0c1edf Mon Sep 17 00:00:00 2001 From: kaloz Date: Tue, 22 Jul 2008 07:24:47 +0000 Subject: sync ath9k with the git tree git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11902 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/ath9k/patches/100-bad_udelay.patch | 15 ------- package/ath9k/patches/110-regd_includes.patch | 15 ------- package/ath9k/patches/120-devid.patch | 23 ---------- package/ath9k/patches/130-eeprom.patch | 16 ------- package/ath9k/patches/140-no_desc_swap.patch | 64 --------------------------- package/ath9k/patches/150-txq_endian.patch | 16 ------- 6 files changed, 149 deletions(-) delete mode 100644 package/ath9k/patches/100-bad_udelay.patch delete mode 100644 package/ath9k/patches/110-regd_includes.patch delete mode 100644 package/ath9k/patches/120-devid.patch delete mode 100644 package/ath9k/patches/130-eeprom.patch delete mode 100644 package/ath9k/patches/140-no_desc_swap.patch delete mode 100644 package/ath9k/patches/150-txq_endian.patch (limited to 'package/ath9k/patches') diff --git a/package/ath9k/patches/100-bad_udelay.patch b/package/ath9k/patches/100-bad_udelay.patch deleted file mode 100644 index 98f33d717..000000000 --- a/package/ath9k/patches/100-bad_udelay.patch +++ /dev/null @@ -1,15 +0,0 @@ -Replace udelay(3000) with mdelay(3), because udelay(3000) fails on ARM - -Signed-off-by: Felix Fietkau - ---- a/drivers/net/wireless/ath9k/recv.c -+++ b/drivers/net/wireless/ath9k/recv.c -@@ -737,7 +737,7 @@ - ath9k_hw_stoppcurecv(ah); /* disable PCU */ - ath9k_hw_setrxfilter(ah, 0); /* clear recv filter */ - stopped = ath9k_hw_stopdmarecv(ah); /* disable DMA engine */ -- udelay(3000); /* 3ms is long enough for 1 frame */ -+ mdelay(3); /* 3ms is long enough for 1 frame */ - tsf = ath9k_hw_gettsf64(ah); - sc->sc_rxlink = NULL; /* just in case */ - return stopped; diff --git a/package/ath9k/patches/110-regd_includes.patch b/package/ath9k/patches/110-regd_includes.patch deleted file mode 100644 index e928da85b..000000000 --- a/package/ath9k/patches/110-regd_includes.patch +++ /dev/null @@ -1,15 +0,0 @@ -Add missing include statements - -Signed-off-by: Felix Fietkau - ---- a/drivers/net/wireless/ath9k/regd.c -+++ b/drivers/net/wireless/ath9k/regd.c -@@ -14,6 +14,8 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#include -+#include - #include "ath9k.h" - #include "regd.h" - #include "regd_common.h" diff --git a/package/ath9k/patches/120-devid.patch b/package/ath9k/patches/120-devid.patch deleted file mode 100644 index d9999f262..000000000 --- a/package/ath9k/patches/120-devid.patch +++ /dev/null @@ -1,23 +0,0 @@ -Add missing device ID for AR9160 - -Signed-off-by: Felix Fietkau - ---- a/drivers/net/wireless/ath9k/hw.c -+++ b/drivers/net/wireless/ath9k/hw.c -@@ -8329,6 +8329,8 @@ - case AR5416_DEVID_PCI: - case AR5416_DEVID_PCIE: - return "Atheros 5416"; -+ case AR9160_DEVID_PCI: -+ return "Atheros 9160"; - case AR9280_DEVID_PCI: - case AR9280_DEVID_PCIE: - return "Atheros 9280"; -@@ -8350,6 +8352,7 @@ - switch (devid) { - case AR5416_DEVID_PCI: - case AR5416_DEVID_PCIE: -+ case AR9160_DEVID_PCI: - case AR9280_DEVID_PCI: - case AR9280_DEVID_PCIE: - ah = ath9k_hw_do_attach(devid, sc, mem, error); diff --git a/package/ath9k/patches/130-eeprom.patch b/package/ath9k/patches/130-eeprom.patch deleted file mode 100644 index 2ab5f381e..000000000 --- a/package/ath9k/patches/130-eeprom.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix a return code check for ath9k_hw_nvram_read, this function returns -AH_TRUE when the call succeeded - -Signed-off-by: Felix Fietkau - ---- a/drivers/net/wireless/ath9k/hw.c -+++ b/drivers/net/wireless/ath9k/hw.c -@@ -803,7 +803,7 @@ - u_int16_t magic, magic2; - int addr; - -- if (ath9k_hw_nvram_read(ah, AR5416_EEPROM_MAGIC_OFFSET, -+ if (!ath9k_hw_nvram_read(ah, AR5416_EEPROM_MAGIC_OFFSET, - &magic)) { - HDPRINTF(ah, HAL_DBG_EEPROM, - "%s: Reading Magic # failed\n", __func__); diff --git a/package/ath9k/patches/140-no_desc_swap.patch b/package/ath9k/patches/140-no_desc_swap.patch deleted file mode 100644 index 46b2ec90d..000000000 --- a/package/ath9k/patches/140-no_desc_swap.patch +++ /dev/null @@ -1,64 +0,0 @@ -Remove the descriptor swap, as the driver already configures the hardware for -descriptor swapping on big endian systems - -Signed-off-by: Felix Fietkau - ---- a/drivers/net/wireless/ath9k/core.c -+++ b/drivers/net/wireless/ath9k/core.c -@@ -2141,22 +2141,6 @@ - memzero(dd, sizeof(*dd)); - } - --/* -- * Endian Swap for transmit descriptor -- * -- * XXX: Move cpu_to_le32() into hw.c and anywhere we set them, then -- * remove this. --*/ --void ath_desc_swap(struct ath_desc *ds) --{ -- ds->ds_link = cpu_to_le32(ds->ds_link); -- ds->ds_data = cpu_to_le32(ds->ds_data); -- ds->ds_ctl0 = cpu_to_le32(ds->ds_ctl0); -- ds->ds_ctl1 = cpu_to_le32(ds->ds_ctl1); -- ds->ds_hw[0] = cpu_to_le32(ds->ds_hw[0]); -- ds->ds_hw[1] = cpu_to_le32(ds->ds_hw[1]); --} -- - /*************/ - /* Utilities */ - /*************/ ---- a/drivers/net/wireless/ath9k/beacon.c -+++ b/drivers/net/wireless/ath9k/beacon.c -@@ -140,11 +140,6 @@ - series[0].RateFlags = (ctsrate) ? HAL_RATESERIES_RTS_CTS : 0; - ath9k_hw_set11n_ratescenario(ah, ds, ds, 0, - ctsrate, ctsduration, series, 4, 0); -- -- /* NB: The desc swap function becomes void, -- * if descriptor swapping is not enabled -- */ -- ath_desc_swap(ds); - } - - /* Move everything from the vap's mcast queue to the hardware cab queue. ---- a/drivers/net/wireless/ath9k/core.h -+++ b/drivers/net/wireless/ath9k/core.h -@@ -384,7 +384,6 @@ - void ath_descdma_cleanup(struct ath_softc *sc, - struct ath_descdma *dd, - struct list_head *head); --void ath_desc_swap(struct ath_desc *ds); - - /******/ - /* RX */ ---- a/drivers/net/wireless/ath9k/xmit.c -+++ b/drivers/net/wireless/ath9k/xmit.c -@@ -2062,7 +2062,6 @@ - AH_TRUE, /* first segment */ - (n_sg == 1) ? AH_TRUE : AH_FALSE, /* last segment */ - ds); /* first descriptor */ -- ath_desc_swap(ds); - - bf->bf_lastfrm = bf; - bf->bf_ht = txctl->ht; diff --git a/package/ath9k/patches/150-txq_endian.patch b/package/ath9k/patches/150-txq_endian.patch deleted file mode 100644 index 11bb38815..000000000 --- a/package/ath9k/patches/150-txq_endian.patch +++ /dev/null @@ -1,16 +0,0 @@ -This patch fixes another endianness issue. -DMA descriptors must always be accessed in native endianness. - -Signed-off-by: Felix Fietkau - ---- a/drivers/net/wireless/ath9k/xmit.c -+++ b/drivers/net/wireless/ath9k/xmit.c -@@ -168,7 +168,7 @@ - __func__, txq->axq_qnum, - ito64(bf->bf_daddr), bf->bf_desc); - } else { -- *txq->axq_link = cpu_to_le32(bf->bf_daddr); -+ *txq->axq_link = bf->bf_daddr; - DPRINTF(sc, ATH_DEBUG_XMIT, "%s: link[%u] (%p)=%llx (%p)\n", - __func__, - txq->axq_qnum, txq->axq_link, -- cgit v1.2.3