netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Felix Janda <felix.janda@posteo.de>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [libnetfilter_log PATCH 2/3] Convert kernel to stdint types
Date: Tue, 16 Jun 2015 18:47:22 +0200	[thread overview]
Message-ID: <20150616164722.GA8999@salvia> (raw)
In-Reply-To: <20150614184351.GA24373@euler>

On Sun, Jun 14, 2015 at 08:43:51PM +0200, Felix Janda wrote:
> Pablo Neira Ayuso wrote:
> > On Sat, May 16, 2015 at 01:41:49PM +0200, Felix Janda wrote:
> > > Signed-off-by: Felix Janda <felix.janda@posteo.de>
> > > ---
> > >  include/libnetfilter_log/linux_nfnetlink_log.h | 42 +++++++++++++-------------
> > >  1 file changed, 21 insertions(+), 21 deletions(-)
> > > 
> > > diff --git a/include/libnetfilter_log/linux_nfnetlink_log.h b/include/libnetfilter_log/linux_nfnetlink_log.h
> > > index 9f38277..c647581 100644
> > > --- a/include/libnetfilter_log/linux_nfnetlink_log.h
> > > +++ b/include/libnetfilter_log/linux_nfnetlink_log.h
> > > @@ -20,31 +20,31 @@ enum nfulnl_msg_types {
> > >  };
> > >  
> > >  struct nfulnl_msg_packet_hdr {
> > > -	__be16		hw_protocol;	/* hw protocol (network order) */
> > > -	__u8	hook;		/* netfilter hook */
> > > -	__u8	_pad;
> > > +	uint16_t		hw_protocol;	/* hw protocol (network order) */
> > > +	uint8_t	hook;		/* netfilter hook */
> > > +	uint8_t	_pad;
> > >  };
> > 
> > I have skipped this patch in this series. It is mangling a cached
> > header from the kernel, I guess there must be a way to make musl happy
> > without this change given that we follow the same approach in other
> > libraries.
> > 
> > Thanks.
> 
> Yes, the conversion of types is not strictly necessary. As long as
> <linux/types.h> is included, everything is fine for musl. I have likely
> misunderstood your previous mail. Feel free to ignore patches mangling
> kernel headers after updating them.

This is what I did. I mangled the patches to skip the chunks that
modify the kernel headers that we cache in the trees.

> Thanks for your review and pushing of patches so far!

Thanks for confirming and for the rather large patchset to address the
musl problems.

  reply	other threads:[~2015-06-16 16:42 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-16 11:41 [libnetfilter_log PATCH 2/3] Convert kernel to stdint types Felix Janda
2015-05-27 12:22 ` Pablo Neira Ayuso
2015-06-14 18:43   ` Felix Janda
2015-06-16 16:47     ` Pablo Neira Ayuso [this message]
2015-06-16 19:22       ` Felix Janda

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150616164722.GA8999@salvia \
    --to=pablo@netfilter.org \
    --cc=felix.janda@posteo.de \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).