From patchwork Fri Jun 29 15:23:25 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: 168144 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 886921007D5 for ; Sat, 30 Jun 2012 01:23:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932121Ab2F2PXp (ORCPT ); Fri, 29 Jun 2012 11:23:45 -0400 Received: from mail.us.es ([193.147.175.20]:37301 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755710Ab2F2PXl (ORCPT ); Fri, 29 Jun 2012 11:23:41 -0400 Received: (qmail 18677 invoked from network); 29 Jun 2012 17:23:40 +0200 Received: from unknown (HELO us.es) (192.168.2.11) by us.es with SMTP; 29 Jun 2012 17:23:40 +0200 Received: (qmail 5857 invoked by uid 507); 29 Jun 2012 15:23:35 -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, 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.5/15099. Clear:RC:1(127.0.0.1):. Processed in 0.030546 secs); 29 Jun 2012 15:23:35 -0000 Received: from unknown (HELO antivirus1) (127.0.0.1) by us.es with SMTP; 29 Jun 2012 15:23:34 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus1 (F-Secure/fsigk_smtp/407/antivirus1); Fri, 29 Jun 2012 17:23:34 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/407/antivirus1) Received: (qmail 25460 invoked from network); 29 Jun 2012 17:25:15 +0200 Received: from 1984.lsi.us.es (HELO localhost.localdomain) (pneira@us.es@150.214.188.80) by us.es with SMTP; 29 Jun 2012 17:25:15 +0200 From: pablo@netfilter.org To: netfilter-devel@vger.kernel.org Cc: gaofeng@cn.fujitsu.com Subject: [PATCH 2/2] netfilter: nf_ct_tcp: missing per-net support for cttimeout Date: Fri, 29 Jun 2012 17:23:25 +0200 Message-Id: <1340983405-32118-2-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1340983405-32118-1-git-send-email-pablo@netfilter.org> References: <1340983405-32118-1-git-send-email-pablo@netfilter.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Pablo Neira Ayuso This patch adds missing per-net support for the cttimeout infrastructure to TCP. Signed-off-by: Pablo Neira Ayuso Acked-by: Gao feng --- net/netfilter/nf_conntrack_proto_tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 07e56ea..a5ac11e 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -821,7 +821,7 @@ static int tcp_error(struct net *net, struct nf_conn *tmpl, static unsigned int *tcp_get_timeouts(struct net *net) { - return tcp_timeouts; + return tcp_pernet(net)->timeouts; } /* Returns verdict for packet, or -1 for invalid. */