From patchwork Mon Oct 31 07:36:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 16787 X-Patchwork-Delegate: sw@simonwunderlich.de 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 70FC483121; Mon, 31 Oct 2016 08:36:55 +0100 (CET) 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=YslIww4F; dkim-adsp=fail (unprotected policy); dkim-atps=neutral Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2001:4d88:2000:7::2; 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 [IPv6:2001:4d88:2000:7::2]) by open-mesh.org (Postfix) with ESMTPS id 6747283105 for ; Mon, 31 Oct 2016 08:36:48 +0100 (CET) Received: from sven-desktop.home.narfation.org (p200300C593C2C3F9E217CA8766CEE734.dip0.t-ipconnect.de [IPv6:2003:c5:93c2:c3f9:e217:ca87:66ce:e734]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id C387D1100A9; Mon, 31 Oct 2016 08:36:47 +0100 (CET) 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=1477899407; bh=gmaBn0M18ZlERL1JvdpUKSntr9b4foq8fDqX6l1SCUw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YslIww4FiyylT5qgGAEsEIrEW28tu0LlvgKCwuZvMcY++dWFrc/xENgKQj16bCc1R tvzyDXWzhT3856/dACrHNbaA7Y+1ebaKIzhc0yYNyYBGvK4WCHHrq7ulRY69jKoVHv tLZpCbIA+9x/v7OZkgFvjwbBeDkUGOpIVPWrij+g= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Mon, 31 Oct 2016 08:36:25 +0100 Message-Id: <20161031073629.31819-2-sven@narfation.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <1637163.TC9CcXIrIP@sven-edge> References: <1637163.TC9CcXIrIP@sven-edge> Subject: [B.A.T.M.A.N.] [PATCH 2/6] batman-adv: Revert "compat: Move get_link_net patch 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" 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 --- 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_ */