From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cong Wang Subject: Re: [Patch net-next] net: sync some IP headers with glibc Date: Thu, 15 Aug 2013 10:48:57 +0800 Message-ID: <1376534937.2626.6.camel@cr0> References: <1376383054-9184-1-git-send-email-amwang@redhat.com> <20130814.134246.1152657041177088716.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, tmb@mageia.org, libc-alpha@sourceware.org, yoshfuji@linux-ipv6.org, carlos@redhat.com To: David Miller Return-path: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org In-Reply-To: <20130814.134246.1152657041177088716.davem@davemloft.net> List-Id: netdev.vger.kernel.org On Wed, 2013-08-14 at 13:42 -0700, David Miller wrote: > From: Cong Wang > Date: Tue, 13 Aug 2013 16:37:33 +0800 > > > @@ -23,31 +23,54 @@ > > > > /* Standard well-defined IP protocols. */ > > enum { > > - IPPROTO_IP = 0, /* Dummy protocol for TCP */ > > - IPPROTO_ICMP = 1, /* Internet Control Message Protocol */ > > > + IPPROTO_IP = 0, /* Dummy protocol for TCP. */ > > Please don't do unrelated things like reformat comments, it makes the > path much harder to audit. OK. > > > - > > +#if __UAPI_DEF_IN6_ADDR > > struct in6_addr { > > union { > > __u8 u6_addr8[16]; > > +#if __UAPI_DEF_IN6_ADDR > > __be16 u6_addr16[8]; > > The same CPP test twice inside of itself, the second test seems > superfluous. I bet this second one was supposed to be > __UAPI_DEF_IN6_ADDR_ALT instead of __UAPI_DEF_IN6_ADDR. Indeed. > > > -#define IPPROTO_HOPOPTS 0 /* IPv6 hop-by-hop options */ > > -#define IPPROTO_ROUTING 43 /* IPv6 routing header */ > > -#define IPPROTO_FRAGMENT 44 /* IPv6 fragmentation header */ > > -#define IPPROTO_ICMPV6 58 /* ICMPv6 */ > > -#define IPPROTO_NONE 59 /* IPv6 no next header */ > > -#define IPPROTO_DSTOPTS 60 /* IPv6 destination options */ > > -#define IPPROTO_MH 135 /* IPv6 mobility header */ > > +#if __UAPI_DEF_IPPROTO_V6 > > +enum { > > + IPPROTO_HOPOPTS = 0, /* IPv6 hop-by-hop options */ > > Again, do not reformat things, it's an unrelated change and makes > this patch harder to review. Ok. I will update the patch. Thanks!