diff mbox series

netfilter: use __u8 instead of uint8_t in uapi header

Message ID 20190921134648.1259-1-yamada.masahiro@socionext.com
State Superseded
Headers show
Series netfilter: use __u8 instead of uint8_t in uapi header | expand

Commit Message

Masahiro Yamada Sept. 21, 2019, 1:46 p.m. UTC 
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>

---

 include/uapi/linux/netfilter_bridge/ebtables.h | 6 +++---
 usr/include/Makefile                           | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

-- 
2.17.1

Comments

Pablo Neira Ayuso Sept. 22, 2019, 7:11 a.m. UTC | #1 
On Sat, Sep 21, 2019 at 10:46:48PM +0900, Masahiro Yamada wrote:
> 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;

>     ^~~~~~~


Applied.
Pablo Neira Ayuso Sept. 22, 2019, 7:13 a.m. UTC | #2 
On Sun, Sep 22, 2019 at 09:11:11AM +0200, Pablo Neira Ayuso wrote:
> On Sat, Sep 21, 2019 at 10:46:48PM +0900, Masahiro Yamada wrote:

> > 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;

> >     ^~~~~~~

> 

> Applied.


Patch does not apply cleanly to nf.git, I have to keep it back, sorry

$ git am /tmp/yamada.masahiro.txt -s
Applying: netfilter: use __u8 instead of uint8_t in uapi header
error: patch failed: usr/include/Makefile:37
error: usr/include/Makefile: patch does not apply
Patch failed at 0001 netfilter: use __u8 instead of uint8_t in uapi header
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Masahiro Yamada Sept. 22, 2019, 11:49 a.m. UTC | #3 
Hi Pablo,

On Sun, Sep 22, 2019 at 4:13 PM Pablo Neira Ayuso <pablo@netfilter.org> wrote:
>

> On Sun, Sep 22, 2019 at 09:11:11AM +0200, Pablo Neira Ayuso wrote:

> > On Sat, Sep 21, 2019 at 10:46:48PM +0900, Masahiro Yamada wrote:

> > > 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;

> > >     ^~~~~~~

> >

> > Applied.

>

> Patch does not apply cleanly to nf.git, I have to keep it back, sorry


Perhaps, reducing the context (git am -C<N>) might help.

Shall I rebase and resend it?

Thanks.

> $ git am /tmp/yamada.masahiro.txt -s

> Applying: netfilter: use __u8 instead of uint8_t in uapi header

> error: patch failed: usr/include/Makefile:37

> error: usr/include/Makefile: patch does not apply

> Patch failed at 0001 netfilter: use __u8 instead of uint8_t in uapi header

> The copy of the patch that failed is found in: .git/rebase-apply/patch

> When you have resolved this problem, run "git am --continue".

> If you prefer to skip this patch, run "git am --skip" instead.

> To restore the original branch and stop patching, run "git am --abort".




-- 
Best Regards
Masahiro Yamada
Pablo Neira Ayuso Sept. 22, 2019, 12:21 p.m. UTC | #4 
On Sun, Sep 22, 2019 at 08:49:11PM +0900, Masahiro Yamada wrote:
> Hi Pablo,

> 

> On Sun, Sep 22, 2019 at 4:13 PM Pablo Neira Ayuso <pablo@netfilter.org> wrote:

> >

> > On Sun, Sep 22, 2019 at 09:11:11AM +0200, Pablo Neira Ayuso wrote:

> > > On Sat, Sep 21, 2019 at 10:46:48PM +0900, Masahiro Yamada wrote:

> > > > 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;

> > > >     ^~~~~~~

> > >

> > > Applied.

> >

> > Patch does not apply cleanly to nf.git, I have to keep it back, sorry

> 

> Perhaps, reducing the context (git am -C<N>) might help.


Not working for me.

> Shall I rebase and resend it?


Please do. Thanks.
diff mbox series

Patch

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