From patchwork Sun Oct 9 06:57:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 16730 X-Patchwork-Delegate: mareklindner@neomailbox.ch Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 9802382459; Sun, 9 Oct 2016 08:58:43 +0200 (CEST) Authentication-Results: open-mesh.org; dmarc=none header.from=narfation.org Authentication-Results: open-mesh.org; dkim=fail reason="verification failed; unprotected key" header.d=narfation.org header.i=@narfation.org header.b=xWcdnLjS; dkim-adsp=fail (unprotected policy); dkim-atps=neutral Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=79.140.41.39; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=pass header.from=narfation.org Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 1A5018244F for ; Sun, 9 Oct 2016 08:57:56 +0200 (CEST) Received: from sven-desktop.home.narfation.org (p200300C593CA60F90000000000002E17.dip0.t-ipconnect.de [IPv6:2003:c5:93ca:60f9::2e17]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 96E3A1100A9 for ; Sun, 9 Oct 2016 08:57:56 +0200 (CEST) Authentication-Results: v3-1039.vlinux.de; dmarc=none header.from=narfation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1475996276; bh=+81j1igRWC/5mvrXO3UbmCTTLA89havjnypgh7emmaw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=xWcdnLjS3hO1Jd9esRY1mKW+Ae8mdNijbXO1C5srVxdjonRrIAvXT0tu33ghv9lOA MWHcnijcvAObHub9G7qyopPEe54CBi1QEFXG2HsaBgnGrii8NQaGBy7uBcJYSaMMbr fUDOMdlHmCy6R3lU6wX5wA488ODgEVmyJMk1ZZgM= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 9 Oct 2016 08:57:34 +0200 Message-Id: <20161009065738.8279-7-sven@narfation.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <1647833.jYley1tZnH@sven-edge> References: <1647833.jYley1tZnH@sven-edge> Subject: [B.A.T.M.A.N.] [PATCH v2 07/11] batman-adv: compat: Move netlink const compat to coccinelle X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" Signed-off-by: Sven Eckelmann --- v2: - new patch --- compat-include/net/genetlink.h | 6 ++++++ compat-patches/0002-genl-const.INFO | 15 +++++++++++++++ compat-patches/0002-genl-const.cocci | 10 ++++++++++ compat-patches/replacements.sh | 9 --------- 4 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 compat-patches/0002-genl-const.INFO create mode 100644 compat-patches/0002-genl-const.cocci delete mode 100755 compat-patches/replacements.sh diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h index 19390c7..6a287e6 100644 --- a/compat-include/net/genetlink.h +++ b/compat-include/net/genetlink.h @@ -163,6 +163,12 @@ batadv_genl_register_family_with_ops_grps(struct genl_family *family, return batadv_genl_register_family(family); } +#define __genl_const + +#else + +#define __genl_const const + #endif /* < KERNEL_VERSION(3, 13, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_NET_GENETLINK_H_ */ diff --git a/compat-patches/0002-genl-const.INFO b/compat-patches/0002-genl-const.INFO new file mode 100644 index 0000000..192c5c6 --- /dev/null +++ b/compat-patches/0002-genl-const.INFO @@ -0,0 +1,15 @@ +Newer kernels make generic netlink ops and multicast groups +const, but older can't have that. We therefore introduce +__genl_const, which can be defined depending on the kernel. + +What kernel versions require this? + +XXX: try to SmPLify + +The struct genl_ops gave the *option* to make it const via: +mcgrof@ergon ~/linux (git::master)$ git describe --contains f84f771d9 +v3.13-rc1~33^2~32^2~2 + +The struct genl_multicast_group was *forced* to be const via: +mcgrof@ergon ~/linux (git::master)$ git describe --contains 2a94fe48f +v3.13-rc1~33^2^2 diff --git a/compat-patches/0002-genl-const.cocci b/compat-patches/0002-genl-const.cocci new file mode 100644 index 0000000..36c71d6 --- /dev/null +++ b/compat-patches/0002-genl-const.cocci @@ -0,0 +1,10 @@ +@@ +attribute __genl_const; +@@ +( +-const struct genl_multicast_group ++__genl_const struct genl_multicast_group +| +-const struct genl_ops ++__genl_const struct genl_ops +) diff --git a/compat-patches/replacements.sh b/compat-patches/replacements.sh deleted file mode 100755 index fc4de84..0000000 --- a/compat-patches/replacements.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -set -e - -# for kernel < 3.13 to make netlink compat code work -sed -i \ - -e 's/^static const struct genl_multicast_group batadv_netlink_mcgrps/static struct genl_multicast_group batadv_netlink_mcgrps/' \ - -e 's/^static const struct genl_ops batadv_netlink_ops/static struct genl_ops batadv_netlink_ops/' \ - build/net/batman-adv/netlink.c