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 2/6] batman-adv: Revert "compat: Move get_link_net patch to coccinelle"
Date: Mon, 31 Oct 2016 08:36:25 +0100 [thread overview]
Message-ID: <20161031073629.31819-2-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 3b79cd3d9b3eb920d17233b5270ee7162d55587e.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
compat-patches/0004-get_link_net.cocci | 13 -------------
compat.h | 7 +++++++
2 files changed, 7 insertions(+), 13 deletions(-)
delete mode 100644 compat-patches/0004-get_link_net.cocci
diff --git a/compat-patches/0004-get_link_net.cocci b/compat-patches/0004-get_link_net.cocci
deleted file mode 100644
index 7520bb6..0000000
--- a/compat-patches/0004-get_link_net.cocci
+++ /dev/null
@@ -1,13 +0,0 @@
-@@
-identifier netdev, fallback_net;
-@@
-
- static struct net *batadv_getlink_net(const struct net_device *netdev,
- struct net *fallback_net)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
-+ return fallback_net;
-+#else
- ...
-+#endif
- }
diff --git a/compat.h b/compat.h
index 2865eeb..245621f 100644
--- a/compat.h
+++ b/compat.h
@@ -145,4 +145,11 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\
#endif /* < KERNEL_VERSION(3, 15, 0) */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
+
+/* WARNING for batadv_getlink_net */
+#define get_link_net get_xstats_size || 1 || netdev->rtnl_link_ops->get_xstats_size
+
+#endif /* < KERNEL_VERSION(4, 0, 0) */
+
#endif /* _NET_BATMAN_ADV_COMPAT_H_ */
--
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 ` Sven Eckelmann [this message]
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 ` [B.A.T.M.A.N.] [PATCH 5/6] batman-adv: Revert "compat: Port netlink port hack " Sven Eckelmann
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-2-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