aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-06-13 19:53:19 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-06-13 19:53:19 +0000
commit6805cd81fca9486d3318fc8f683f22247163bf29 (patch)
tree63d6ff0fd768a444db2f9e88f58fcd125e6bce53
parentd2cecd477904de8637c6b045790afe3b7ad95e08 (diff)
downloadupstream-6805cd81fca9486d3318fc8f683f22247163bf29.tar.gz
upstream-6805cd81fca9486d3318fc8f683f22247163bf29.tar.bz2
upstream-6805cd81fca9486d3318fc8f683f22247163bf29.zip
mac80211: fix build of b43
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21790 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/0170-dma_set_coherent_mask.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/package/mac80211/patches/0170-dma_set_coherent_mask.patch b/package/mac80211/patches/0170-dma_set_coherent_mask.patch
new file mode 100644
index 0000000000..9bafbeb87e
--- /dev/null
+++ b/package/mac80211/patches/0170-dma_set_coherent_mask.patch
@@ -0,0 +1,28 @@
+From 3c02b107ec11e14ef21e7a444ad83f0ef1e68f79 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sun, 13 Jun 2010 20:41:55 +0200
+Subject: [PATCH 1/2] compat: backport dma_set_coherent_mask
+
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ include/linux/compat-2.6.34.h | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+--- a/include/linux/compat-2.6.34.h
++++ b/include/linux/compat-2.6.34.h
+@@ -216,6 +216,14 @@ do { \
+ #define dma_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0)
+ #endif
+
++static inline int dma_set_coherent_mask(struct device *dev, u64 mask)
++{
++ if (!dma_supported(dev, mask))
++ return -EIO;
++ dev->coherent_dma_mask = mask;
++ return 0;
++}
++
+ #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)) */
+
+ #endif /* LINUX_26_34_COMPAT_H */