From patchwork Tue Oct 26 16:09:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 69263 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5DB0CB6EEB for ; Wed, 27 Oct 2010 03:09:51 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759970Ab0JZQJX (ORCPT ); Tue, 26 Oct 2010 12:09:23 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:58462 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759958Ab0JZQJW (ORCPT ); Tue, 26 Oct 2010 12:09:22 -0400 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 9651824C088; Tue, 26 Oct 2010 09:09:45 -0700 (PDT) Date: Tue, 26 Oct 2010 09:09:45 -0700 (PDT) Message-Id: <20101026.090945.112602190.davem@davemloft.net> To: randy.dunlap@oracle.com Cc: sfr@canb.auug.org.au, netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: Tree for October 25 (netfilter/nf_conntrack_reasm) From: David Miller In-Reply-To: <20101025.220316.39174493.davem@davemloft.net> References: <20101025145834.9b68e026.sfr@canb.auug.org.au> <20101025165529.9cedfeac.randy.dunlap@oracle.com> <20101025.220316.39174493.davem@davemloft.net> X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Miller Date: Mon, 25 Oct 2010 22:03:16 -0700 (PDT) > From: Randy Dunlap > Date: Mon, 25 Oct 2010 16:55:29 -0700 > >> On Mon, 25 Oct 2010 14:58:34 +1100 Stephen Rothwell wrote: >> >>> Hi all, >>> >>> Reminder: do not add 2.6.38 destined stuff to linux-next until after >>> 2.6.37-rc1 is released. >> >> net/ipv6/netfilter/nf_conntrack_reasm.c:628: error: 'nf_ct_frag6_sysctl_header' undeclared (first use in this function) >> net/ipv6/netfilter/nf_conntrack_reasm.c:628: error: 'nf_net_netfilter_sysctl_path' undeclared (first use in this function) >> net/ipv6/netfilter/nf_conntrack_reasm.c:629: error: 'nf_ct_frag6_sysctl_table' undeclared (first use in this function) >> net/ipv6/netfilter/nf_conntrack_reasm.c:640: error: 'nf_ct_frag6_sysctl_header' undeclared (first use in this function) >> >> >> config file is attached. > > Should also be fixed by the commit I just pointed you to. Actually it isn't :-) I'll commit the following to fix this, thanks! -------------------- netfilter: Add missing CONFIG_SYSCTL checks in ipv6's nf_conntrack_reasm.c Reported-by: Randy Dunlap Signed-off-by: David S. Miller --- net/ipv6/netfilter/nf_conntrack_reasm.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 489d71b..3a3f129 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -625,21 +625,24 @@ int nf_ct_frag6_init(void) inet_frags_init_net(&nf_init_frags); inet_frags_init(&nf_frags); +#ifdef CONFIG_SYSCTL nf_ct_frag6_sysctl_header = register_sysctl_paths(nf_net_netfilter_sysctl_path, nf_ct_frag6_sysctl_table); if (!nf_ct_frag6_sysctl_header) { inet_frags_fini(&nf_frags); return -ENOMEM; } +#endif return 0; } void nf_ct_frag6_cleanup(void) { +#ifdef CONFIG_SYSCTL unregister_sysctl_table(nf_ct_frag6_sysctl_header); nf_ct_frag6_sysctl_header = NULL; - +#endif inet_frags_fini(&nf_frags); nf_init_frags.low_thresh = 0;