From patchwork Sat Sep 21 13:46:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 174191 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp665269ill; Sat, 21 Sep 2019 06:47:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqy9JTUU0CFjscJav9UT9DQabBp16ii/Vc6e474gMkpy14Q1LYZ8jLBQxwhVHZmGViLH0mPh X-Received: by 2002:a17:906:b204:: with SMTP id p4mr23129621ejz.185.1569073653693; Sat, 21 Sep 2019 06:47:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569073653; cv=none; d=google.com; s=arc-20160816; b=lURgBc1+BrJXIHZYpD9EY/1OBNQFIQ/ZlCkEYmp2hmbJGsokmUal5CtysLt6+Y6I9F 2p4veOgmSYuZSbDEzl1cq9zXjluuT+KVbRwo81SsWu3OBpfKQA929MKCuBuptCmzKOlb OH0/qeYlfcfS6EVrGcMF+D8QyO+jkNOkqoCqG/DyyyppT4XXXAgzZuCgokCXWdWIajaZ ehxOHHT5l4gRWwiPcxn72EpqFFHIBt7N41NI+cprNLs8MZrG7EaqLih3zmqc4hdlehQO IhcUyOcMdhea0F9thsLcrBFCLffvFQ4Om+IOvsbztzWYmsQvj87WQ2HQnd9u2MEeZ3nU rV7A== 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 :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=5xK4mZcFYP3ny+MZeQAf2c3rhdo7t2J/7fDHiLRieNc=; b=YhrPiFWLwiTt91R+76sQ8Gwaxg3WQ2O7xEd/MAN7U99nz4sYn5IcZ3zjW4+V0oUDgv CU+QpgYKt/Kr72H3bd9ufBdqApcwIenrN6vGkI8oHIUCpDak8DCgBPqYDXjg8kt718qc CU9N2FI/4XhdnpVOtUuM+/XeA18mt2hgf5ops3pMskSNJ+CjHgPJn9xTBgnGYcYxSDGH LBMt4BGsu0xz6EbXx7b+VqvpwxUvypX0/90/6FHLeowQD79+3SbIn0rEVDh4WbmEqdsr 0+bqmm9OhuTlyPN57r/kueJmRs4kPvg3zhPmM4lMC1RuMWsuORiiKyWG8QGK3WHPS6Kr aLBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=SJas1X8N; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 d26si3554424eda.190.2019.09.21.06.47.33; Sat, 21 Sep 2019 06:47:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=SJas1X8N; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437907AbfIUNr2 (ORCPT + 26 others); Sat, 21 Sep 2019 09:47:28 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:58497 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394165AbfIUNr1 (ORCPT ); Sat, 21 Sep 2019 09:47:27 -0400 Received: from grover.flets-west.jp (softbank126021098169.bbtec.net [126.21.98.169]) (authenticated) by conuserg-08.nifty.com with ESMTP id x8LDktRD010507; Sat, 21 Sep 2019 22:46:56 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x8LDktRD010507 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1569073616; bh=5xK4mZcFYP3ny+MZeQAf2c3rhdo7t2J/7fDHiLRieNc=; h=From:To:Cc:Subject:Date:From; b=SJas1X8NoFJ85mQNC+VMMlxMm5DsBKgz8PlYbi6nAJDoG2rLDF5DUGpVb2bPKhy20 CPzJm5+9qLjI4jnYr07t1tRGcEGPQ7mFaPMK4ETqhQZoUmGq5r9gvbTKjD/FLDi5G1 q2Ltzb4oCvWMSXwYyxBWAiXyzfAeDlWTVTuoFUyr/92k5DXBPLFfsAfrtWMT+dYPMP UrKwUxoL22NbdPgPULzQ2MrHluPT01kiYVNFCI18zjK9O3SL1SDFUvQfL21wDcdhj3 tRRgWg+ii5G5yYPnnnIKRqPREONhriO6Zu7WSAPod7Vvo+hmY5NEvR3gAZ30tYs3CS +c70FVcZya/dw== X-Nifty-SrcIP: [126.21.98.169] From: Masahiro Yamada To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , netfilter-devel@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH] netfilter: use __u8 instead of uint8_t in uapi header Date: Sat, 21 Sep 2019 22:46:48 +0900 Message-Id: <20190921134648.1259-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- include/uapi/linux/netfilter_bridge/ebtables.h | 6 +++--- usr/include/Makefile | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.17.1 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 77e0a0cd972a..faba1e5c3873 100644 --- a/usr/include/Makefile +++ b/usr/include/Makefile @@ -37,7 +37,6 @@ header-test- += linux/hdlc/ioctl.h header-test- += linux/ivtv.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