diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-08-11 13:52:27 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-08-11 13:52:27 +0000 |
| commit | 0da1b304fcb69df143a30335779f3b6886bf2fba (patch) | |
| tree | 3d6e1cf9fed773c35a5cfaec71f59a3633e80c7c /package/mac80211/patches/830-b43-read-correct-register-on-bcma-bus.patch | |
| parent | b968a100483fbe18783e7152589854c72bbe6923 (diff) | |
| download | master-187ad058-0da1b304fcb69df143a30335779f3b6886bf2fba.tar.gz master-187ad058-0da1b304fcb69df143a30335779f3b6886bf2fba.tar.bz2 master-187ad058-0da1b304fcb69df143a30335779f3b6886bf2fba.zip | |
mac80211: update to 2011-08-10
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27958 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/830-b43-read-correct-register-on-bcma-bus.patch')
| -rw-r--r-- | package/mac80211/patches/830-b43-read-correct-register-on-bcma-bus.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/package/mac80211/patches/830-b43-read-correct-register-on-bcma-bus.patch b/package/mac80211/patches/830-b43-read-correct-register-on-bcma-bus.patch deleted file mode 100644 index 8d88a66b50..0000000000 --- a/package/mac80211/patches/830-b43-read-correct-register-on-bcma-bus.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f706821596d8a3dcda314c38b13d91f108fdc435 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens <hauke@hauke-m.de> -Date: Fri, 22 Jul 2011 17:10:29 +0200 -Subject: [PATCH 21/22] b43: read correct register on bcma bus. - - -Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> ---- - drivers/net/wireless/b43/dma.c | 20 +++++++++++++++++--- - 1 files changed, 17 insertions(+), 3 deletions(-) - ---- a/drivers/net/wireless/b43/dma.c -+++ b/drivers/net/wireless/b43/dma.c -@@ -795,9 +795,23 @@ static u64 supported_dma_mask(struct b43 - u32 tmp; - u16 mmio_base; - -- tmp = b43_read32(dev, SSB_TMSHIGH); -- if (tmp & SSB_TMSHIGH_DMA64) -- return DMA_BIT_MASK(64); -+ switch (dev->dev->bus_type) { -+#ifdef CONFIG_B43_BCMA -+ case B43_BUS_BCMA: -+ tmp = bcma_aread32(dev->dev->bdev, BCMA_IOST); -+ if (tmp & BCMA_IOST_DMA64) -+ return DMA_BIT_MASK(64); -+ break; -+#endif -+#ifdef CONFIG_B43_SSB -+ case B43_BUS_SSB: -+ tmp = ssb_read32(dev->dev->sdev, SSB_TMSHIGH); -+ if (tmp & SSB_TMSHIGH_DMA64) -+ return DMA_BIT_MASK(64); -+ break; -+#endif -+ } -+ - mmio_base = b43_dmacontroller_base(0, 0); - b43_write32(dev, mmio_base + B43_DMA32_TXCTL, B43_DMA32_TXADDREXT_MASK); - tmp = b43_read32(dev, mmio_base + B43_DMA32_TXCTL); |