From 38a2d4cab39ad1b6ea0b00409d335c86453c5c81 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 13 Jun 2010 20:07:37 +0000 Subject: mac80211: rename dma_set_coherent_mask() patch to 170-dma_set_coherent_mask.patch SVN-Revision: 21791 --- .../patches/0170-dma_set_coherent_mask.patch | 28 ---------------------- .../patches/170-dma_set_coherent_mask.patch | 28 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 package/mac80211/patches/0170-dma_set_coherent_mask.patch create mode 100644 package/mac80211/patches/170-dma_set_coherent_mask.patch diff --git a/package/mac80211/patches/0170-dma_set_coherent_mask.patch b/package/mac80211/patches/0170-dma_set_coherent_mask.patch deleted file mode 100644 index 9bafbeb87e..0000000000 --- a/package/mac80211/patches/0170-dma_set_coherent_mask.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3c02b107ec11e14ef21e7a444ad83f0ef1e68f79 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sun, 13 Jun 2010 20:41:55 +0200 -Subject: [PATCH 1/2] compat: backport dma_set_coherent_mask - - -Signed-off-by: Hauke Mehrtens ---- - 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 */ diff --git a/package/mac80211/patches/170-dma_set_coherent_mask.patch b/package/mac80211/patches/170-dma_set_coherent_mask.patch new file mode 100644 index 0000000000..9bafbeb87e --- /dev/null +++ b/package/mac80211/patches/170-dma_set_coherent_mask.patch @@ -0,0 +1,28 @@ +From 3c02b107ec11e14ef21e7a444ad83f0ef1e68f79 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Sun, 13 Jun 2010 20:41:55 +0200 +Subject: [PATCH 1/2] compat: backport dma_set_coherent_mask + + +Signed-off-by: Hauke Mehrtens +--- + 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 */ -- cgit v1.2.3