aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-05-20 12:06:57 +0000
committerJonas Gorski <jogo@openwrt.org>2013-05-20 12:06:57 +0000
commit61e79bfb452d4020aa95f57d90877a8c17e7aaaf (patch)
tree5e43be97d6f204f840c4e8b548607667950a4e35
parent2677e0458205af594e8151cfde043b05ff67dc6c (diff)
downloadupstream-61e79bfb452d4020aa95f57d90877a8c17e7aaaf.tar.gz
upstream-61e79bfb452d4020aa95f57d90877a8c17e7aaaf.tar.bz2
upstream-61e79bfb452d4020aa95f57d90877a8c17e7aaaf.zip
mac80211: remove superfluous patch
This is already handles in compat-3.8.h as prandom* was introduced in 3.8; only the aliases were removed in 3.10. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36666 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/101-compat-handle-renaming-of-random32-to-prandom_u32.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/package/mac80211/patches/101-compat-handle-renaming-of-random32-to-prandom_u32.patch b/package/mac80211/patches/101-compat-handle-renaming-of-random32-to-prandom_u32.patch
deleted file mode 100644
index c5807da6c7..0000000000
--- a/package/mac80211/patches/101-compat-handle-renaming-of-random32-to-prandom_u32.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ccfc866db68eeaaeae8665baf5345debe6f26e94 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sat, 18 May 2013 11:25:22 +0200
-Subject: [PATCH 2/2] compat: handle renaming of random32() to prandom_u32()
-
-496f2f93b1cc286f5a4f4f9acdc1e5314978683f renamed random32() to
-prandom_u32(), so add an appropriate macro for older kernels.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- include/linux/compat-3.10.h | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/include/linux/compat-3.10.h b/include/linux/compat-3.10.h
-index 9d6e55c..1baa996 100644
---- a/include/linux/compat-3.10.h
-+++ b/include/linux/compat-3.10.h
-@@ -75,6 +75,18 @@ static inline void fb_enable_skip_vt_switch(struct fb_info *info)
- module_driver(__pcmcia_driver, pcmcia_register_driver, \
- pcmcia_unregister_driver)
-
-+/**
-+ * backport of:
-+ *
-+ * commit 496f2f93b1cc286f5a4f4f9acdc1e5314978683f
-+ * Author: Akinobu Mita <akinobu.mita@gmail.com>
-+ * Date: Mon Dec 17 16:04:23 2012 -0800
-+ *
-+ * random32: rename random32 to prandom
-+ *
-+ */
-+#define prandom_u32() random32()
-+
- #else /* kernel is >= 3.10 */
- /*
- * We'd delete this upstream ever got this, we use our
---
-1.7.10.4
-