From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: Re: linux-next: Tree for June 23 (net) Date: Fri, 24 Jun 2011 08:38:52 -0700 Message-ID: <4E04AF8C.6050007@oracle.com> References: <20110623155431.6bfe3b40.sfr@canb.auug.org.au> <20110623091429.2d51b0f0.randy.dunlap@oracle.com> <20110623.212120.2043173528294538748.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: sfr@canb.auug.org.au, netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org To: David Miller Return-path: In-Reply-To: <20110623.212120.2043173528294538748.davem@davemloft.net> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On 06/23/11 21:21, David Miller wrote: > From: Randy Dunlap > Date: Thu, 23 Jun 2011 09:14:29 -0700 > >> On Thu, 23 Jun 2011 15:54:31 +1000 Stephen Rothwell wrote: >> >>> Hi all, >>> >>> Changes since 20110622: >>> >>> The powerpc allyesconfig (and probably others) is still broken because we >>> now build the staging drivers and because of a commit in the net tree. >>> The breakage in Linus' tree is fixed by one of Andrew's patches above. >>> >>> The net tree gained 2 build failures that I have left (see above). >> >> >> When CONFIG_INET is not enabled: >> >> net/core/dev.c:2535: error: implicit declaration of function 'ip_is_fragment' > > I'll fix this like so: Acked-by: Randy Dunlap Thanks. > diff --git a/include/net/ip.h b/include/net/ip.h > index d603cd3..9fa9416 100644 > --- a/include/net/ip.h > +++ b/include/net/ip.h > @@ -236,6 +236,11 @@ extern void ipfrag_init(void); > > extern void ip_static_sysctl_init(void); > > +static inline bool ip_is_fragment(const struct iphdr *iph) > +{ > + return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0; > +} > + > #ifdef CONFIG_INET > #include > > @@ -250,11 +255,6 @@ int ip_decrease_ttl(struct iphdr *iph) > return --iph->ttl; > } > > -static inline bool ip_is_fragment(const struct iphdr *iph) > -{ > - return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0; > -} > - > static inline > int ip_dont_fragment(struct sock *sk, struct dst_entry *dst) > { -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***