From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 5/6] batman-adv: Revert "compat: Port netlink port hack to coccinelle"
Date: Mon, 31 Oct 2016 08:36:28 +0100 [thread overview]
Message-ID: <20161031073629.31819-5-sven@narfation.org> (raw)
In-Reply-To: <1637163.TC9CcXIrIP@sven-edge>
The coccinelle in Debian Jessie seems to be broken. It fails to parse
the patches and thus makes it impossible to use the out-of-tree
module in these systems. Therefore drop it for now.
This reverts commit 57ed6cbca85a0a681a0fa8b4690259429f3ea9a5.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
compat-include/linux/netlink.h | 20 +++++++++++++-------
compat-include/net/genetlink.h | 11 -----------
compat-patches/0001-netlink-portid.cocci | 17 -----------------
compat.h | 6 ++++++
4 files changed, 19 insertions(+), 35 deletions(-)
delete mode 100644 compat-patches/0001-netlink-portid.cocci
diff --git a/compat-include/linux/netlink.h b/compat-include/linux/netlink.h
index ca2bdf0..4f2185d 100644
--- a/compat-include/linux/netlink.h
+++ b/compat-include/linux/netlink.h
@@ -26,13 +26,19 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0)
-#define netlink_notify_portid(__notify) (__notify->pid)
-#define NETLINK_CB_PORTID(__skb) NETLINK_CB(__skb).pid
-
-#else
-
-#define netlink_notify_portid(__notify) (__notify->portid)
-#define NETLINK_CB_PORTID(__skb) NETLINK_CB(__skb).portid
+#include <net/scm.h>
+
+struct batadv_netlink_skb_parms {
+ struct ucred creds; /* Skb credentials */
+ union {
+ __u32 portid;
+ __u32 pid;
+ };
+ __u32 dst_group;
+};
+
+#undef NETLINK_CB
+#define NETLINK_CB(skb) (*(struct batadv_netlink_skb_parms *)&((skb)->cb))
#endif /* < KERNEL_VERSION(3, 7, 0) */
diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h
index b057e6c..2e8e17a 100644
--- a/compat-include/net/genetlink.h
+++ b/compat-include/net/genetlink.h
@@ -24,17 +24,6 @@
#include <linux/version.h>
#include_next <net/genetlink.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0)
-
-#define genl_info_snd_portid(__genl_info) (__genl_info->snd_pid)
-
-#else
-
-#define genl_info_snd_portid(__genl_info) (__genl_info->snd_portid)
-
-#endif /* < KERNEL_VERSION(3, 7, 0) */
-
-
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
#include <linux/export.h>
diff --git a/compat-patches/0001-netlink-portid.cocci b/compat-patches/0001-netlink-portid.cocci
deleted file mode 100644
index 5fc504e..0000000
--- a/compat-patches/0001-netlink-portid.cocci
+++ /dev/null
@@ -1,17 +0,0 @@
-@@
-struct netlink_notify *notify;
-@@
--notify->portid
-+netlink_notify_portid(notify)
-
-@@
-struct genl_info *info;
-@@
--info->snd_portid
-+genl_info_snd_portid(info)
-
-@@
-expression skb;
-@@
--NETLINK_CB(skb).portid
-+NETLINK_CB_PORTID(skb)
diff --git a/compat.h b/compat.h
index 78de7ea..d987577 100644
--- a/compat.h
+++ b/compat.h
@@ -67,6 +67,12 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\
#endif /* < KERNEL_VERSION(3, 3, 0) */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0)
+
+#define snd_portid snd_pid
+
+#endif /* < KERNEL_VERSION(3, 7, 0) */
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
#define batadv_interface_set_mac_addr(x, y) \
--
2.10.1
next prev parent reply other threads:[~2016-10-31 7:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-31 7:35 [B.A.T.M.A.N.] [PATCH 0/6] batman-adv: Revert coccinelle compat support Sven Eckelmann
2016-10-31 7:36 ` [B.A.T.M.A.N.] [PATCH 1/6] batman-adv: Revert "compat: Move vid api wrapper to coccinelle" Sven Eckelmann
2016-10-31 7:36 ` [B.A.T.M.A.N.] [PATCH 2/6] batman-adv: Revert "compat: Move get_link_net patch " Sven Eckelmann
2016-10-31 7:36 ` [B.A.T.M.A.N.] [PATCH 3/6] batman-adv: Revert "compat: Replace IFF_NO_QUEUE with coccinelle" Sven Eckelmann
2016-10-31 7:36 ` [B.A.T.M.A.N.] [PATCH 4/6] batman-adv: Revert "compat: Move netlink const compat to coccinelle" Sven Eckelmann
2016-11-01 0:46 ` Linus Lüssing
2016-11-01 0:53 ` Linus Lüssing
2016-10-31 7:36 ` Sven Eckelmann [this message]
2016-10-31 7:36 ` [B.A.T.M.A.N.] [PATCH 6/6] batman-adv: Revert "Add support for coccinelle in compat-patches" Sven Eckelmann
2016-11-01 0:24 ` [B.A.T.M.A.N.] [PATCH 0/6] batman-adv: Revert coccinelle compat support Linus Lüssing
2016-11-08 16:17 ` Simon Wunderlich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161031073629.31819-5-sven@narfation.org \
--to=sven@narfation.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).