From patchwork Sun Nov 19 16:12:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17135 X-Patchwork-Delegate: sven@narfation.org 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 1BED982AFC; Sun, 19 Nov 2017 17:12:59 +0100 (CET) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=narfation.org header.i=@narfation.org header.b="gPu3oR86"; dkim-atps=neutral Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2001:4d88:2000:7::2; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver= Received: from v3-1039.vlinux.de (narfation.org [IPv6:2001:4d88:2000:7::2]) by open-mesh.org (Postfix) with ESMTPS id 934768210D for ; Sun, 19 Nov 2017 17:12:25 +0100 (CET) Received: from sven-desktop.home.narfation.org (p200300C593EBC3FD792CD3ECD963554B.dip0.t-ipconnect.de [IPv6:2003:c5:93eb:c3fd:792c:d3ec:d963:554b]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 100391100F6; Sun, 19 Nov 2017 17:12:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1511107945; bh=AqAUkc9MtorFPJk+4WcSrvDeQMn6kglwlk+Xy7T9EPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gPu3oR86XWOmblbS7IYuamuessgNC9l14ajGFp2wI9Qd1h1iijKSzBFeKeW8shQ0k PS5xKN+dfLpsWH3nZ03ZJkirdA9v0FdFoYMBYTupKZ4qN28M9Va6WsvWB4DD+lZjvG jw90cGHK0f41pxrJquv5oiKXQyzr7npusSEdEDbw= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 19 Nov 2017 17:12:02 +0100 Message-Id: <20171119161207.32588-2-sven@narfation.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171119161207.32588-1-sven@narfation.org> References: <20171119161207.32588-1-sven@narfation.org> Subject: [B.A.T.M.A.N.] [PATCH 1/6] batman-adv: include gfp.h for GFP_* defines X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 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 linux/gfp.h provides the GFP_ATOMIC and GFP_KERNEL define. It should therefore be included instead of linux/fs.h. Signed-off-by: Sven Eckelmann --- net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bat_v_elp.c | 2 +- net/batman-adv/bat_v_ogm.c | 2 +- net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/hard-interface.c | 2 +- net/batman-adv/hash.c | 2 +- net/batman-adv/icmp_socket.c | 1 + net/batman-adv/log.c | 1 + net/batman-adv/main.c | 2 +- net/batman-adv/multicast.c | 2 +- net/batman-adv/netlink.c | 2 +- net/batman-adv/network-coding.c | 2 +- net/batman-adv/originator.c | 2 +- net/batman-adv/send.c | 2 +- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/sysfs.c | 2 +- net/batman-adv/tp_meter.c | 2 +- net/batman-adv/translation-table.c | 2 +- net/batman-adv/tvlv.c | 2 +- 22 files changed, 22 insertions(+), 20 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 4de912c8..250cb4fb 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 1aa175a4..39fbed58 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 0ce2d95a..3cc5cd2f 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index f5b917b6..2f12a556 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index e708fda4..1035c53a 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index c49ca050..1c202448 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index b962430a..cffa9e7f 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 464c98f2..7f459679 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/hash.c b/net/batman-adv/hash.c index 33fd8fae..0569ee47 100644 --- a/net/batman-adv/hash.c +++ b/net/batman-adv/hash.c @@ -21,7 +21,7 @@ #include "hash.h" #include "main.h" -#include +#include #include #include diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index ca51c488..f1a67eaa 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c index 78e4dddb..59a1eb13 100644 --- a/net/batman-adv/log.c +++ b/net/batman-adv/log.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 6b3db9b4..45f0f4ff 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -25,8 +25,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 3cef5a76..30c442e4 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index d70d0e2d..a06a2cd4 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -26,8 +26,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index c3d65af3..f614d74f 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index f365de37..4018ecba 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index a9c505b7..68b0bb1a 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 178d998b..aea576f3 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index e54a662b..5c29e38a 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index f890319b..52e667ec 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index efa4ef02..66092c6b 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/tvlv.c b/net/batman-adv/tvlv.c index fcaa7bd4..308a0f31 100644 --- a/net/batman-adv/tvlv.c +++ b/net/batman-adv/tvlv.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include From patchwork Sun Nov 19 16:12:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17134 X-Patchwork-Delegate: sven@narfation.org 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 68B3F82B04; Sun, 19 Nov 2017 17:12:46 +0100 (CET) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=narfation.org header.i=@narfation.org header.b="T7d5Lw0X"; dkim-atps=neutral Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=79.140.41.39; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver= Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 943498253F for ; Sun, 19 Nov 2017 17:12:26 +0100 (CET) Received: from sven-desktop.home.narfation.org (p200300C593EBC3FD792CD3ECD963554B.dip0.t-ipconnect.de [IPv6:2003:c5:93eb:c3fd:792c:d3ec:d963:554b]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id B9487110113; Sun, 19 Nov 2017 17:12:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1511107945; bh=FQicQdHcjSRt4F2YUNF9cF2sTUA3hzWg3qDV22YVnXM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T7d5Lw0XgByMNbevb6d5uQw9GnlY25h0qJ3TIjAMEVxO1gI5fgKkFRM7dP2fQjXMf AtTwAvyaKUdFajPRFc3OdyZ5wK/HIGTdSqtysqbijU8E1rUMjdSg5Zjdw58QUcR6uP b/jAiXsk9KOPfUbLxmnmwgEx6bN2xMBd4/rHk/2w= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 19 Nov 2017 17:12:03 +0100 Message-Id: <20171119161207.32588-3-sven@narfation.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171119161207.32588-1-sven@narfation.org> References: <20171119161207.32588-1-sven@narfation.org> Subject: [B.A.T.M.A.N.] [PATCH 2/6] batman-adv: include build_bug.h for BUILD_BUG_ON define X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 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" commit bc6245e5efd7 ("bug: split BUILD_BUG stuff out into ") added a new header for BUILD_BUG_ON. It should therefore be included instead of linux/bug.h Signed-off-by: Sven Eckelmann --- compat-include/linux/build_bug.h | 34 ++++++++++++++++++++++++++++++++++ net/batman-adv/main.c | 2 +- net/batman-adv/tp_meter.c | 2 +- net/batman-adv/translation-table.c | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 compat-include/linux/build_bug.h diff --git a/compat-include/linux/build_bug.h b/compat-include/linux/build_bug.h new file mode 100644 index 00000000..d1ebfa71 --- /dev/null +++ b/compat-include/linux/build_bug.h @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * + * License-Filename: LICENSES/preferred/GPL-2.0 + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_BUILD_BUG_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_BUILD_BUG_H_ + +#include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) +#include_next +#else +#include +#endif + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_BUILD_BUG_H_ */ diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 45f0f4ff..107b50e5 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -21,7 +21,7 @@ #include "main.h" #include -#include +#include #include #include #include diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 52e667ec..6b044717 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -22,7 +22,7 @@ #include "main.h" #include -#include +#include #include #include #include diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 66092c6b..db7a67ee 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include From patchwork Sun Nov 19 16:12:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17132 X-Patchwork-Delegate: sven@narfation.org 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 7BF438210D; Sun, 19 Nov 2017 17:12:30 +0100 (CET) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=narfation.org header.i=@narfation.org header.b="OYwnMvpf"; dkim-atps=neutral Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2001:4d88:2000:7::2; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver= Received: from v3-1039.vlinux.de (narfation.org [IPv6:2001:4d88:2000:7::2]) by open-mesh.org (Postfix) with ESMTPS id D169C828DD for ; Sun, 19 Nov 2017 17:12:26 +0100 (CET) Received: from sven-desktop.home.narfation.org (p200300C593EBC3FD792CD3ECD963554B.dip0.t-ipconnect.de [IPv6:2003:c5:93eb:c3fd:792c:d3ec:d963:554b]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 583A8110114; Sun, 19 Nov 2017 17:12:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1511107946; bh=ykcVayTWNXybv7kszaQPu3++vuuh3vvpYwFHIjPDzLI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OYwnMvpf4bd/5rB5koEKCwfE6/wO4DrJD3j9dNuffIffiR5QzFaBsmARbVBwTECO8 /u58zun5kRTb4N30yEKnVUI5IYfj6GWRfVkhYUqNx0Oq/gMHiDH+gXDFOfeelSm7YK Ts81GoUcmx3Eb/W3iQtgUJblP37fQKFAmAuJfdJg= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 19 Nov 2017 17:12:04 +0100 Message-Id: <20171119161207.32588-4-sven@narfation.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171119161207.32588-1-sven@narfation.org> References: <20171119161207.32588-1-sven@narfation.org> Subject: [B.A.T.M.A.N.] [PATCH 3/6] batman-adv: Include net.h for net_ratelimited_function X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 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 linux/net.h provides the net_ratelimited_function. It should therefore be included directly before it is used. Signed-off-by: Sven Eckelmann --- net/batman-adv/network-coding.c | 1 + net/batman-adv/translation-table.c | 1 + 2 files changed, 2 insertions(+) diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index f614d74f..64f14f66 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index db7a67ee..ce90bfd7 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include From patchwork Sun Nov 19 16:12:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17136 X-Patchwork-Delegate: sven@narfation.org 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 B66D982B24; Sun, 19 Nov 2017 17:13:11 +0100 (CET) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=narfation.org header.i=@narfation.org header.b="ch8iJGXZ"; dkim-atps=neutral Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2001:4d88:2000:7::2; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver= Received: from v3-1039.vlinux.de (narfation.org [IPv6:2001:4d88:2000:7::2]) by open-mesh.org (Postfix) with ESMTPS id 5528E8041B for ; Sun, 19 Nov 2017 17:12:27 +0100 (CET) Received: from sven-desktop.home.narfation.org (p200300C593EBC3FD792CD3ECD963554B.dip0.t-ipconnect.de [IPv6:2003:c5:93eb:c3fd:792c:d3ec:d963:554b]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id F14CC1100E8; Sun, 19 Nov 2017 17:12:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1511107947; bh=Fyd06mjHwoqQ8boLiRwRIsKWSC34lp+m6JBi/P+HqzU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ch8iJGXZ9wgzi8eT5DBavNDm696OWh1jrpSnsgr/3GaPRZ6elQeJu7jVwyL1A6i7r gFpICEEXIourc2yt7MOYYI5X/HKOkNLxXPVj2EM8I6b6RjWfocEXnvCl7I/knciUC/ xebw+wcykXsvQorUhuh9wAkciLMxrlSq9n47p5RM= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 19 Nov 2017 17:12:05 +0100 Message-Id: <20171119161207.32588-5-sven@narfation.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171119161207.32588-1-sven@narfation.org> References: <20171119161207.32588-1-sven@narfation.org> Subject: [B.A.T.M.A.N.] [PATCH 4/6] batman-adv: include kobject.h for kobject_* functions X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 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 linux/kobject.h provides the kobject_* function declarations and should therefore be included directly before they are used. Signed-off-by: Sven Eckelmann --- net/batman-adv/sysfs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 5c29e38a..9eed0664 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include From patchwork Sun Nov 19 16:12:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17137 X-Patchwork-Delegate: sven@narfation.org 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 6799882B37; Sun, 19 Nov 2017 17:13:24 +0100 (CET) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=narfation.org header.i=@narfation.org header.b="UwSLmx1p"; dkim-atps=neutral Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=79.140.41.39; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver= Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id EBA4B8041B for ; Sun, 19 Nov 2017 17:12:27 +0100 (CET) Received: from sven-desktop.home.narfation.org (p200300C593EBC3FD792CD3ECD963554B.dip0.t-ipconnect.de [IPv6:2003:c5:93eb:c3fd:792c:d3ec:d963:554b]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 968981100E8; Sun, 19 Nov 2017 17:12:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1511107947; bh=jwnHmm190fSKE0vw7tJafeukeqDwl2wb7z5RXSto2Ko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UwSLmx1pGQfHcTkmscBCBwgZRpoiQ0lyLrBGLqLcYWGcqyiE+8Jqt3Ac5RW2EUDyA s24mS/Xy6UheWAhTXBfyayqQ7d4E+uZBCH+pRTu94gc1qAvIvzQhbl1xO9qFuiVFLb /tzdJpoI1TmF6YXDLEiSvfFEl6EevHJ0EWNSWQi0= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 19 Nov 2017 17:12:06 +0100 Message-Id: <20171119161207.32588-6-sven@narfation.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171119161207.32588-1-sven@narfation.org> References: <20171119161207.32588-1-sven@narfation.org> Subject: [B.A.T.M.A.N.] [PATCH 5/6] batman-adv: Remove unused sched.h include X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 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 linux/wait.h include was removed with commit 421d988b2c08 ("batman-adv: Consolidate logging related functions"). The previously required (but not unused) linux/sched.h include can also be dropped now. Signed-off-by: Sven Eckelmann --- net/batman-adv/debugfs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index e5f76c76..96df3959 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -28,7 +28,6 @@ #include #include #include -#include /* for linux/wait.h */ #include #include #include From patchwork Sun Nov 19 16:12:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17138 X-Patchwork-Delegate: sven@narfation.org 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 1C8C982B54; Sun, 19 Nov 2017 17:13:32 +0100 (CET) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=narfation.org header.i=@narfation.org header.b="d1fP5C9E"; dkim-atps=neutral Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=79.140.41.39; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver= Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 9F5A68041B for ; Sun, 19 Nov 2017 17:12:28 +0100 (CET) Received: from sven-desktop.home.narfation.org (p200300C593EBC3FD792CD3ECD963554B.dip0.t-ipconnect.de [IPv6:2003:c5:93eb:c3fd:792c:d3ec:d963:554b]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 3D0F71100E8; Sun, 19 Nov 2017 17:12:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1511107948; bh=QU1Fk/MnhmnqZiRlKbdFAmm5z2lMs78hQtjdqoaJjdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d1fP5C9ENQBjNzPOOprN5feMsDI9XMRUXiQjDBzBgVG7/7GYrzm9At9N+mieYvhyB 4ZcOfbezbcvltMuxXxMYWebOgJRBR6BV0zQx6sx+dlvn1xbilxmSEWBRoBXK7YFpPF jHlmbjA9dC8GpImp4+tePXG/dynP+MWGod6uKOc8= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 19 Nov 2017 17:12:07 +0100 Message-Id: <20171119161207.32588-7-sven@narfation.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171119161207.32588-1-sven@narfation.org> References: <20171119161207.32588-1-sven@narfation.org> Subject: [B.A.T.M.A.N.] [PATCH 6/6] batman-adv: compat: Map to linux/nl80211.h for Linux < 3.7 X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 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 uapi header of linux/nl80211.h was introduced with 3.7. Older version have to rely on the linux/nl80211.h header. Signed-off-by: Sven Eckelmann --- compat-include/uapi/linux/nl80211.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compat-include/uapi/linux/nl80211.h b/compat-include/uapi/linux/nl80211.h index 9b18178e..ead4c6dd 100644 --- a/compat-include/uapi/linux/nl80211.h +++ b/compat-include/uapi/linux/nl80211.h @@ -25,7 +25,11 @@ #define _NET_BATMAN_ADV_COMPAT_UAPI_LINUX_NL80211_H_ #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) #include_next +#else +#include +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)