From 900da6ca6012638cd9ad7d830aae891a451c63a1 Mon Sep 17 00:00:00 2001 From: hauke Date: Sun, 6 Dec 2015 13:31:58 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47795 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../020-header-fix-genl_notify-on-kernel-4.4.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/kernel/mac80211/patches/020-header-fix-genl_notify-on-kernel-4.4.patch 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 +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 +--- + 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 */ -- 2.11.0