AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

netfilter: ebtables: use __u8 instead of uint8_t in uapi header

Browse Source 
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 <command-line>: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 <yamada.masahiro@socionext.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Masahiro Yamada 2019-09-24 07:40:06 +09:00 committed by Pablo Neira Ayuso
parent acab713177
commit 20ff1cb506
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/uapi/linux/netfilter_bridge/ebtables.h
View File

@ -123,7 +123,7 @@ struct ebt_entry_match {
union { union {
struct { struct {
char name[EBT_EXTENSION_MAXNAMELEN]; char name[EBT_EXTENSION_MAXNAMELEN];
uint8_t revision; __u8 revision;
}; };
struct xt_match *match; struct xt_match *match;
} u; } u;
@ -136,7 +136,7 @@ struct ebt_entry_watcher {
union { union {
struct { struct {
char name[EBT_EXTENSION_MAXNAMELEN]; char name[EBT_EXTENSION_MAXNAMELEN];
uint8_t revision; __u8 revision;
}; };
struct xt_target *watcher; struct xt_target *watcher;
} u; } u;
@ -149,7 +149,7 @@ struct ebt_entry_target {
union { union {
struct { struct {
char name[EBT_EXTENSION_MAXNAMELEN]; char name[EBT_EXTENSION_MAXNAMELEN];
uint8_t revision; __u8 revision;
}; };
struct xt_target *target; struct xt_target *target;
} u; } u;

1
usr/include/Makefile
View File

@ -38,7 +38,6 @@ header-test- += linux/ivtv.h
header-test- += linux/jffs2.h header-test- += linux/jffs2.h
header-test- += linux/kexec.h header-test- += linux/kexec.h
header-test- += linux/matroxfb.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_ipv4/ipt_LOG.h
header-test- += linux/netfilter_ipv6/ip6t_LOG.h header-test- += linux/netfilter_ipv6/ip6t_LOG.h
header-test- += linux/nfc.h header-test- += linux/nfc.h