From patchwork Fri Apr 29 19:15:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 15989 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 91D61822E3; Fri, 29 Apr 2016 21:15:17 +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=hp2a4u8p; 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 B2949804C3 for ; Fri, 29 Apr 2016 21:15:04 +0200 (CEST) Received: from sven-edge.localnet (p200300C593C12BFD0000000000002E16.dip0.t-ipconnect.de [IPv6:2003:c5:93c1:2bfd::2e16]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 51FD11100F1; Fri, 29 Apr 2016 21:15:04 +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=1461957304; bh=OQZtOKsK+9NwrzT/G49PsUdUjjW+bVcThox76FJ2pp8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hp2a4u8pliyhQwYXkQQyuJ0KO5l3KZVbF4yT5C0rp6c7xtCzmtzhp1U/nl0XO07z3 OIyYeSC7ppCoDkNUjRCdpbV6lOFEcVeVuq8zdBz+hqzNq4IHe+KyTzWBsrUVtqpZoD BcTJz6xh1XuvpgTGM/72yledslwJy0aZrypi3awg= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 29 Apr 2016 21:15:03 +0200 Message-ID: <10673163.SjRvAOM3uS@sven-edge> User-Agent: KMail/4.14.10 (Linux/4.5.0-1-amd64; KDE/4.14.14; x86_64; ; ) In-Reply-To: <1461875848-11720-4-git-send-email-andrew@lunn.ch> References: <1461875848-11720-1-git-send-email-andrew@lunn.ch> <1461875848-11720-4-git-send-email-andrew@lunn.ch> MIME-Version: 1.0 Subject: Re: [B.A.T.M.A.N.] [PATCH 03/10] batman-adv: add generic netlink query API to replace debugfs files 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" On Thursday 28 April 2016 22:37:21 Andrew Lunn wrote: > From: Matthias Schiffer > > debugfs is currently severely broken virtually everywhere in the kernel > where files are dynamically added and removed (see > http://lkml.iu.edu/hypermail/linux/kernel/1506.1/02196.html for some > details). In addition to that, debugfs is not namespace-aware. > > Also, the debugfs interface will try to fix the whole list of originators/ > TT entries into a single buffer. The situation has improved in recent > kernels,as the seq_file infrastructure will fall back to vmalloc now when > kmalloc fails. Still, converting all information to text and potentially > retrying multiple times until the buffer is big enough is very inefficient. > > This commit adds generic infrastructur for the netlink interface to > batman-adv and implements the following command: > > * BATADV_CMD_GET_ROUTING_ALGOS: will return the list of supported routing > algorithms > * BATADV_CMD_GET_MESH_INFO: will return basic information about a > batman-adv softif (name, index and MAC address for both the softif and > the primary hardif; routing algorithm; batman-adv version) > * BATADV_CMD_GET_HARDIFS: will return the list of hardifs (including > index, name and MAC address) of all hardifs for a given softif > > Signed-off-by: Matthias Schiffer > --- > Makefile | 1 + > include/uapi/linux/batman_adv.h | 49 ++++++++ > net/batman-adv/Makefile | 1 + > net/batman-adv/main.c | 48 ++++++++ > net/batman-adv/main.h | 1 + > net/batman-adv/netlink.c | 251 > ++++++++++++++++++++++++++++++++++++++++ net/batman-adv/netlink.h | > 36 ++++++ > 7 files changed, 387 insertions(+) > create mode 100644 include/uapi/linux/batman_adv.h > create mode 100644 net/batman-adv/netlink.c > create mode 100644 net/batman-adv/netlink.h You can find the missing includes in the attached patch Kind regards, Sven From: Sven Eckelmann Date: Fri, 29 Apr 2016 20:43:27 +0200 Subject: [PATCH] missing includes 3 --- net/batman-adv/main.c | 3 +++ net/batman-adv/main.h | 1 + net/batman-adv/netlink.c | 13 +++++++++++-- net/batman-adv/netlink.h | 5 +++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 05fc597..7b5f585 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -46,6 +47,8 @@ #include #include #include +#include +#include #include #include diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index eddbb59..3b770df 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -191,6 +191,7 @@ enum batadv_uev_type { #include "types.h" struct batadv_ogm_packet; +struct netlink_callback; struct seq_file; struct sk_buff; diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 6682f78..e302de3 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -18,14 +18,23 @@ #include "main.h" #include "netlink.h" +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #include #include #include "hard-interface.h" -#include "originator.h" #include "soft-interface.h" -#include "translation-table.h" struct genl_family batadv_netlink_family = { .id = GENL_ID_GENERATE, diff --git a/net/batman-adv/netlink.h b/net/batman-adv/netlink.h index 31022d4..ae0eeb9 100644 --- a/net/batman-adv/netlink.h +++ b/net/batman-adv/netlink.h @@ -18,7 +18,12 @@ #ifndef _NET_BATMAN_ADV_NETLINK_H_ #define _NET_BATMAN_ADV_NETLINK_H_ +#include +#include #include +#include + +struct nlmsghdr; void batadv_netlink_register(void); void batadv_netlink_unregister(void);