Date:2010-07-11 20:50:55 (8 years 4 months ago)
Author:hauke
Commit:a04d4f8ddb2065f634c872be00c32dcfaef91b85
Message:kernel: add missing dma_dev member to struct ssb_device to make b43/b43legacy compile with current mac80211 version

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22135 3c298f89-4303-0410-b956-a3cf2f4a3e73
Files: target/linux/generic/patches-2.6.35/976-ssb_add_dma_dev.patch (1 diff)

Change Details

target/linux/generic/patches-2.6.35/976-ssb_add_dma_dev.patch
1From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2
3Add dma_dev, a pointer to struct device, to struct ssb_device. We pass it
4to the generic DMA API with SSB_BUSTYPE_PCI and SSB_BUSTYPE_SSB.
5ssb_devices_register() sets up it properly.
6
7This is preparation for replacing the ssb bus specific DMA API (ssb_dma_*)
8with the generic DMA API.
9
10Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
11Acked-by: Michael Buesch <mb@bu3sch.de>
12Cc: Gary Zambrano <zambrano@broadcom.com>
13Cc: Stefano Brivio <stefano.brivio@polimi.it>
14Cc: Larry Finger <Larry.Finger@lwfinger.net>
15Cc: John W. Linville <linville@tuxdriver.com>
16Acked-by: David S. Miller <davem@davemloft.net>
17Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
18---
19
20 drivers/ssb/main.c | 2 ++
21 include/linux/ssb/ssb.h | 2 +-
22 2 files changed, 3 insertions(+), 1 deletion(-)
23
24--- a/drivers/ssb/main.c
25@@ -486,6 +486,7 @@ static int ssb_devices_register(struct s
26 #ifdef CONFIG_SSB_PCIHOST
27             sdev->irq = bus->host_pci->irq;
28             dev->parent = &bus->host_pci->dev;
29+ sdev->dma_dev = dev->parent;
30 #endif
31             break;
32         case SSB_BUSTYPE_PCMCIA:
33@@ -501,6 +502,7 @@ static int ssb_devices_register(struct s
34             break;
35         case SSB_BUSTYPE_SSB:
36             dev->dma_mask = &dev->coherent_dma_mask;
37+ sdev->dma_dev = dev;
38             break;
39         }
40
41--- a/include/linux/ssb/ssb.h
42@@ -167,7 +167,7 @@ struct ssb_device {
43      * is an optimization. */
44     const struct ssb_bus_ops *ops;
45
46- struct device *dev;
47+ struct device *dev, *dma_dev;
48
49     struct ssb_bus *bus;
50     struct ssb_device_id id;

Archive Download the corresponding diff file



interactive