From patchwork Tue Dec 5 14:35:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 844781 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=openmesh-com.20150623.gappssmtp.com header.i=@openmesh-com.20150623.gappssmtp.com header.b="KfKpn8PB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yrkqy1LvNz9s72 for ; Wed, 6 Dec 2017 01:38:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753001AbdLEOiD (ORCPT ); Tue, 5 Dec 2017 09:38:03 -0500 Received: from mail-qt0-f193.google.com ([209.85.216.193]:35070 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752531AbdLEOgD (ORCPT ); Tue, 5 Dec 2017 09:36:03 -0500 Received: by mail-qt0-f193.google.com with SMTP id u10so1166841qtg.2 for ; Tue, 05 Dec 2017 06:36:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openmesh-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7mCPGJ7PW3B8vxpDNe7dQb411zdf8gFuUPJ6PzmHWvs=; b=KfKpn8PBJXXHyNiPsE8TEODv7R7389AGEdp4+VSSfFe8aAAXjy/ZW8qLZOAyuGaaJv lzP8LEBwCn11gsruPz8+Ku/p7G2ZqWO4F4fONXW7SnyPID7haXMqDlsjdXO7i6AnTcCA 4/E3I6SCYidfIMSkMn44g87XEtEXy6azv2l0COcdjbuLpJhaob3mil4NhiPf1pRRtfcf IqA8yW/1QHcRlocW+eJmKEAYYVLCXOeStYfbYgbHmZwRqWvbqsvC7LSMcc0qPsEOwHdE nyCcpn5iKVL1ZJ2OeI/TG42LrBWhkRxng3L3bM5zq0+CoPFP35zqBpZXmDoczhBKXU3u cj8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7mCPGJ7PW3B8vxpDNe7dQb411zdf8gFuUPJ6PzmHWvs=; b=jfcHsHLm2l7DQiBecu+OtKdWqGvDZdHOHgyp9DwIAL/2PljOAfFLlndXIGk/fE+a4e ZVAEiXJB52sU4MuVaOBavO3K/a2Nnt4we9520zYzH7KhP9UIGKpUKQ/50sfqne3fxhbD s9SjXw10I1hs6YDJ/SehHgotAojHX8cTwk2SbFA0u0VVF5dVHemLfibIzDLCTJcXFgDT ZFORjBTbhb1vqFtc4Q4Wb3ejLNtk2SxIPT/VyOStTIwvmLtbewZN/uouhCZ+ue0lN7hD aX6nhWBVFz8Bm9ScEt0Ero+hsB/P+Xi1nRgDZbrd6GuENjW0UHEznkmceX5Nntg2S5iu MSGQ== X-Gm-Message-State: AKGB3mJru+7uIFW/y8DZViUICwsAfortifr5RfEQ6vnUAiqoHigQr9Fe c4hsbcSBoWkWw6kC0Gc/awVU6EhW X-Google-Smtp-Source: AGs4zMacN2nw2IKLp1yjbStUQuimmi8bFHpnD8ovMZMoVK70XjzlfqlHmTrew/dgwP6hNRN3/w59tg== X-Received: by 10.200.47.55 with SMTP id j52mr2309323qta.26.1512484562877; Tue, 05 Dec 2017 06:36:02 -0800 (PST) Received: from sven-desktop.home.narfation.org (p2003007C6F4F41EE52D08C1B61D759F9.dip0.t-ipconnect.de. [2003:7c:6f4f:41ee:52d0:8c1b:61d7:59f9]) by smtp.gmail.com with ESMTPSA id e16sm178331qtk.64.2017.12.05.06.36.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Dec 2017 06:36:02 -0800 (PST) From: Sven Eckelmann To: netdev@vger.kernel.org Cc: "David S . Miller" , Jiri Pirko , Eric Dumazet , linux-kernel@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Sven Eckelmann Subject: [RFC v2 2/6] batman-adv: Rename batman-adv.h to batadv_genl.h Date: Tue, 5 Dec 2017 15:35:10 +0100 Message-Id: <20171205143514.4441-3-sven.eckelmann@openmesh.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171205143514.4441-1-sven.eckelmann@openmesh.com> References: <20171205143514.4441-1-sven.eckelmann@openmesh.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This file contains the relevant information to let userspace communicate with batman-adv over generic netlink. The relevant genl enums for the attributes and commands have the prefix batadv_genl. Renaming this file to this name therefore represents the content better and avoids confusion with the file which will contain the packet format definitions. Signed-off-by: Sven Eckelmann --- MAINTAINERS | 2 +- include/uapi/linux/{batman_adv.h => batadv_genl.h} | 6 +++--- net/batman-adv/bat_algo.c | 2 +- net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bat_v.c | 2 +- net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/main.c | 2 +- net/batman-adv/netlink.c | 2 +- net/batman-adv/originator.c | 2 +- net/batman-adv/tp_meter.c | 2 +- net/batman-adv/translation-table.c | 2 +- net/batman-adv/types.h | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) rename include/uapi/linux/{batman_adv.h => batadv_genl.h} (98%) diff --git a/MAINTAINERS b/MAINTAINERS index aa71ab52fd76..68abe39ee87a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2563,7 +2563,7 @@ S: Maintained F: Documentation/ABI/testing/sysfs-class-net-batman-adv F: Documentation/ABI/testing/sysfs-class-net-mesh F: Documentation/networking/batman-adv.rst -F: include/uapi/linux/batman_adv.h +F: include/uapi/linux/batadv_genl.h F: net/batman-adv/ BAYCOM/HDLCDRV DRIVERS FOR AX.25 diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batadv_genl.h similarity index 98% rename from include/uapi/linux/batman_adv.h rename to include/uapi/linux/batadv_genl.h index a0fed6c01a46..8ed28676e198 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batadv_genl.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef _UAPI_LINUX_BATMAN_ADV_H_ -#define _UAPI_LINUX_BATMAN_ADV_H_ +#ifndef _UAPI_LINUX_BATADV_GENL_H_ +#define _UAPI_LINUX_BATADV_GENL_H_ #define BATADV_GENL_NAME "batadv" @@ -423,4 +423,4 @@ enum batadv_tp_meter_reason { BATADV_TP_REASON_TOO_MANY = 133, }; -#endif /* _UAPI_LINUX_BATMAN_ADV_H_ */ +#endif /* _UAPI_LINUX_BATADV_GENL_H_ */ diff --git a/net/batman-adv/bat_algo.c b/net/batman-adv/bat_algo.c index 37390a21e5e9..07392a25235f 100644 --- a/net/batman-adv/bat_algo.c +++ b/net/batman-adv/bat_algo.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include "bat_algo.h" #include "netlink.h" diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 4055338de7f0..7727a39c4265 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include "bat_algo.h" #include "bitarray.h" diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 7eea24204b55..b43ba53daafd 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "bat_algo.h" #include "bat_v_elp.h" diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 15d64a575034..1a9594d68db2 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include "hard-interface.h" #include "hash.h" diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 5e2d00731e9f..23c8032ce478 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include "gateway_common.h" #include "hard-interface.h" diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index a56ae758f799..c034e5c504c4 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include "bat_algo.h" #include "bat_iv_ogm.h" diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index a9679bdca432..5a66eb6c45f1 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include "bat_algo.h" #include "bridge_loop_avoidance.h" diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index dafc73811aa6..ec7b357e1781 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include "bat_algo.h" #include "distributed-arp-table.h" diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index d73346057310..152189b6f862 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include "hard-interface.h" #include "log.h" diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 5d3ba12002df..0065b8a2a1e4 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include "bridge_loop_avoidance.h" #include "hard-interface.h" diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index e4a79f9e2e24..9b78d9364e45 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include "packet.h"