From patchwork Tue Jun 19 03:37:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 165641 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C0AE4B7012 for ; Tue, 19 Jun 2012 13:38:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754001Ab2FSDiM (ORCPT ); Mon, 18 Jun 2012 23:38:12 -0400 Received: from mail.us.es ([193.147.175.20]:54813 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753994Ab2FSDhs (ORCPT ); Mon, 18 Jun 2012 23:37:48 -0400 Received: (qmail 20919 invoked from network); 19 Jun 2012 05:37:46 +0200 Received: from unknown (HELO us.es) (192.168.2.11) by us.es with SMTP; 19 Jun 2012 05:37:46 +0200 Received: (qmail 3489 invoked by uid 507); 19 Jun 2012 03:37:45 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on antivirus1 X-Spam-Level: X-Spam-Status: No, score=-99.2 required=7.5 tests=BAYES_50,SPF_HELO_FAIL, USER_IN_WHITELIST autolearn=disabled version=3.3.1 Received: from 127.0.0.1 by antivirus1 (envelope-from , uid 501) with qmail-scanner-2.08 (clamdscan: 0.97.4/15056. Clear:RC:1(127.0.0.1):. Processed in 0.048834 secs); 19 Jun 2012 03:37:45 -0000 Received: from unknown (HELO antivirus1) (127.0.0.1) by us.es with SMTP; 19 Jun 2012 03:37:45 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus1 (F-Secure/fsigk_smtp/407/antivirus1); Tue, 19 Jun 2012 05:37:45 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/407/antivirus1) Received: (qmail 28931 invoked from network); 19 Jun 2012 05:39:06 +0200 Received: from 1984.lsi.us.es (HELO us.es) (1984lsi@150.214.188.80) by us.es with AES128-SHA encrypted SMTP; 19 Jun 2012 05:39:06 +0200 Date: Tue, 19 Jun 2012 05:37:45 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: Re: [PATCH 0/4] netfilter updates for net-next (batch 3) Message-ID: <20120619033745.GA31405@1984> References: <1340075789-6196-1-git-send-email-pablo@netfilter.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1340075789-6196-1-git-send-email-pablo@netfilter.org> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Tue, Jun 19, 2012 at 05:16:25AM +0200, pablo@netfilter.org wrote: [...] > You can pull these changes from: > > git://1984.lsi.us.es/nf-next master Please, also take the small patch attached after this 4 patch series. It fixes one linking issue. Sorry, I'll put more care next time testing compilation options more extensively. From af6b248c22759fb7448668bbe495f1cbe0a9109d Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 19 Jun 2012 05:25:46 +0200 Subject: [PATCH] netfilter: fix missing symbols if CONFIG_NETFILTER_NETLINK_QUEUE_CT unset ERROR: "nfqnl_ct_parse" [net/netfilter/nfnetlink_queue.ko] undefined! ERROR: "nfqnl_ct_seq_adjust" [net/netfilter/nfnetlink_queue.ko] undefined! ERROR: "nfqnl_ct_put" [net/netfilter/nfnetlink_queue.ko] undefined! ERROR: "nfqnl_ct_get" [net/netfilter/nfnetlink_queue.ko] undefined! We have to use CONFIG_NETFILTER_NETLINK_QUEUE_CT in include/net/netfilter/nfnetlink_queue.h, not CONFIG_NF_CONNTRACK. Signed-off-by: Pablo Neira Ayuso --- include/net/netfilter/nfnetlink_queue.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/netfilter/nfnetlink_queue.h b/include/net/netfilter/nfnetlink_queue.h index 9f8095c..86267a5 100644 --- a/include/net/netfilter/nfnetlink_queue.h +++ b/include/net/netfilter/nfnetlink_queue.h @@ -5,7 +5,7 @@ struct nf_conn; -#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) +#ifdef CONFIG_NETFILTER_NETLINK_QUEUE_CT struct nf_conn *nfqnl_ct_get(struct sk_buff *entskb, size_t *size, enum ip_conntrack_info *ctinfo); struct nf_conn *nfqnl_ct_parse(const struct sk_buff *skb, -- 1.7.10