aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-12-06 13:31:58 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-12-06 13:31:58 +0000
commit96a938d082a22e411c568a9b5b4e38753c285ffc (patch)
tree9732e2e578eb441b66d2f576e66e782197237525 /package/kernel/mac80211
parent9157360ac512c4f0031151c4523479e108e3f67b (diff)
downloadupstream-96a938d082a22e411c568a9b5b4e38753c285ffc.tar.gz
upstream-96a938d082a22e411c568a9b5b4e38753c285ffc.tar.bz2
upstream-96a938d082a22e411c568a9b5b4e38753c285ffc.zip
mac80211: fix build of mac80211-hwsim on kernel 4.4
This genl_notify() backport should not be applied for kernel 4.4. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47795
Diffstat (limited to 'package/kernel/mac80211')
-rw-r--r--package/kernel/mac80211/patches/020-header-fix-genl_notify-on-kernel-4.4.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/020-header-fix-genl_notify-on-kernel-4.4.patch b/package/kernel/mac80211/patches/020-header-fix-genl_notify-on-kernel-4.4.patch
new file mode 100644
index 0000000000..a15f30c872
--- /dev/null
+++ b/package/kernel/mac80211/patches/020-header-fix-genl_notify-on-kernel-4.4.patch
@@ -0,0 +1,28 @@
+From 7a6e8b70a956a722f90d551e920c1096a9455b54 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sat, 5 Dec 2015 14:10:28 +0100
+Subject: [PATCH 07/12] header: fix genl_notify() on kernel 4.4
+
+The change of the parameters of genl_notify() is in kernel 4.4. This
+backport should not be applied for kernel 4.4 and newer kernel versions.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ backport/backport-include/net/genetlink.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/backport-include/net/genetlink.h
++++ b/backport-include/net/genetlink.h
+@@ -146,10 +146,12 @@ backport_genlmsg_multicast_allns(struct
+ #define __genl_const
+ #else /* < 3.13 */
+ #define __genl_const const
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0)
+ #define genl_notify(_fam, _skb, _info, _group, _flags) \
+ genl_notify(_fam, _skb, genl_info_net(_info), \
+ genl_info_snd_portid(_info), \
+ _group, _info->nlhdr, _flags)
++#endif /* < 4.4 */
+ #endif /* < 3.13 */
+
+ #endif /* __BACKPORT_NET_GENETLINK_H */