From patchwork Wed Sep 25 20:30:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 174421 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1129673ill; Wed, 25 Sep 2019 13:30:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqxCKn7DKG5FQUm1XU/aE8Onr2bOldNutaiHyAunP6ZkIsPt9CqaPHhKo1WOBNdQd2VGjQqz X-Received: by 2002:a17:907:2118:: with SMTP id qn24mr1061227ejb.81.1569443432177; Wed, 25 Sep 2019 13:30:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569443432; cv=none; d=google.com; s=arc-20160816; b=YHKte2UsS/QTix0Rcdv9l4dsUMM5RSh6Ard1jrV3UYqDPWgvLeRum9cg/zFDbEeyCD NLP72rZxPQCU8k1StZG6OEZBVrQewYZMjQGqrLTvyOo/8UnJ5tvZmUdN2bV9JO++ZOa1 j8UbTMNdGDs3xVskX1R9rU5oswmo+yPHC0kpE7EOxkD/sja0a77SNu072WX4RWn8GMSF IzYjkUVGb2h8X4VtJe1xJ4ED8GqsTDhgBU8t6LkYPRxbnQomFs7IlI3vNyQxN2EufLS7 lqAnwCHBsVAqYo35AJYQs9ogeZQ5jpvl+pAahozYB7kit0JuKjyC57zxPOVpqfNgXnJA ecPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=lYRtOIH7z++4LEX0banH3/avLyQ6BGIBUotgorVWaNc=; b=mHlmM71/BPlsd+2OMRpM7oCIMxdywTWrC38OlQ+WBThCm2X2vRDw1YeONV4iv/mKE7 fQAi/fOO4kbIjjdPff5S5yF6jBlKlf2mfmTu3MZB84D/ouj+KB/nfr4FPBzkHTTlS0cU iehpTyDakoCQ3Tju5gkDcPmjLeVjHMIRdoCSgJYCfnAHeATKUxctGU3meQCft3IqpAN4 7WCmYZFSv7VfhQt2AcLHxdyx58jYkB054O6RA7tFNjekteQ9PzzWErBpzyempBictOJT zqqsVfy8nrzRFnvi7tpfr/qfwtaa8t2ArlfO3UUeQjblvsyvfiqP1/1o8XK0zEBNPBXV 3Rcw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q35si86082eda.122.2019.09.25.13.30.32; Wed, 25 Sep 2019 13:30:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393135AbfIYUaa (ORCPT + 8 others); Wed, 25 Sep 2019 16:30:30 -0400 Received: from correo.us.es ([193.147.175.20]:44666 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392914AbfIYUaY (ORCPT ); Wed, 25 Sep 2019 16:30:24 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 8ACC9C516E for ; Wed, 25 Sep 2019 22:30:18 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 7B74ECA0F3 for ; Wed, 25 Sep 2019 22:30:18 +0200 (CEST) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id 70D22D1DBB; Wed, 25 Sep 2019 22:30:18 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on antivirus1-rhel7.int X-Spam-Level: X-Spam-Status: No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50, SMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1 Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id E25D1A7DB2; Wed, 25 Sep 2019 22:30:15 +0200 (CEST) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Wed, 25 Sep 2019 22:30:15 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from salvia.here (sys.soleta.eu [212.170.55.40]) (Authenticated sender: pneira@us.es) by entrada.int (Postfix) with ESMTPA id B73484265A5A; Wed, 25 Sep 2019 22:30:15 +0200 (CEST) X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 4/5] netfilter: ebtables: use __u8 instead of uint8_t in uapi header Date: Wed, 25 Sep 2019 22:30:02 +0200 Message-Id: <20190925203003.20112-5-pablo@netfilter.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190925203003.20112-1-pablo@netfilter.org> References: <20190925203003.20112-1-pablo@netfilter.org> MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Masahiro Yamada When CONFIG_UAPI_HEADER_TEST=y, exported headers are compile-tested to make sure they can be included from user-space. Currently, linux/netfilter_bridge/ebtables.h is excluded from the test coverage. To make it join the compile-test, we need to fix the build errors attached below. For a case like this, we decided to use __u{8,16,32,64} variable types in this discussion: https://lkml.org/lkml/2019/6/5/18 Build log: CC usr/include/linux/netfilter_bridge/ebtables.h.s In file included from :32:0: ./usr/include/linux/netfilter_bridge/ebtables.h:126:4: error: unknown type name ‘uint8_t’ uint8_t revision; ^~~~~~~ ./usr/include/linux/netfilter_bridge/ebtables.h:139:4: error: unknown type name ‘uint8_t’ uint8_t revision; ^~~~~~~ ./usr/include/linux/netfilter_bridge/ebtables.h:152:4: error: unknown type name ‘uint8_t’ uint8_t revision; ^~~~~~~ Signed-off-by: Masahiro Yamada Signed-off-by: Pablo Neira Ayuso --- include/uapi/linux/netfilter_bridge/ebtables.h | 6 +++--- usr/include/Makefile | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.11.0 diff --git a/include/uapi/linux/netfilter_bridge/ebtables.h b/include/uapi/linux/netfilter_bridge/ebtables.h index 3b86c14ea49d..8076c940ffeb 100644 --- a/include/uapi/linux/netfilter_bridge/ebtables.h +++ b/include/uapi/linux/netfilter_bridge/ebtables.h @@ -123,7 +123,7 @@ struct ebt_entry_match { union { struct { char name[EBT_EXTENSION_MAXNAMELEN]; - uint8_t revision; + __u8 revision; }; struct xt_match *match; } u; @@ -136,7 +136,7 @@ struct ebt_entry_watcher { union { struct { char name[EBT_EXTENSION_MAXNAMELEN]; - uint8_t revision; + __u8 revision; }; struct xt_target *watcher; } u; @@ -149,7 +149,7 @@ struct ebt_entry_target { union { struct { char name[EBT_EXTENSION_MAXNAMELEN]; - uint8_t revision; + __u8 revision; }; struct xt_target *target; } u; diff --git a/usr/include/Makefile b/usr/include/Makefile index 1fb6abe29b2f..379cc5abc162 100644 --- a/usr/include/Makefile +++ b/usr/include/Makefile @@ -38,7 +38,6 @@ header-test- += linux/ivtv.h header-test- += linux/jffs2.h header-test- += linux/kexec.h header-test- += linux/matroxfb.h -header-test- += linux/netfilter_bridge/ebtables.h header-test- += linux/netfilter_ipv4/ipt_LOG.h header-test- += linux/netfilter_ipv6/ip6t_LOG.h header-test- += linux/nfc.h