From patchwork Thu Jan 10 15:28:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 211066 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 3F8CB2C0347 for ; Fri, 11 Jan 2013 02:29:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754004Ab3AJP3B (ORCPT ); Thu, 10 Jan 2013 10:29:01 -0500 Received: from mail.us.es ([193.147.175.20]:37148 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753952Ab3AJP27 (ORCPT ); Thu, 10 Jan 2013 10:28:59 -0500 Received: (qmail 12619 invoked from network); 10 Jan 2013 16:28:58 +0100 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 10 Jan 2013 16:28:58 +0100 Received: (qmail 16624 invoked by uid 507); 10 Jan 2013 15:28:58 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.97.6/16458. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-97.0/7.5):. Processed in 4.805616 secs); 10 Jan 2013 15:28:58 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-97.0 required=7.5 tests=BAYES_50, RCVD_IN_BRBL_LASTEXT,RCVD_IN_PBL,RCVD_IN_SORBS_DUL,RDNS_DYNAMIC, USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 10 Jan 2013 15:28:53 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/407/antivirus2); Thu, 10 Jan 2013 16:28:53 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/407/antivirus2) Received: (qmail 26586 invoked from network); 10 Jan 2013 16:28:53 +0100 Received: from 25.54.20.95.dynamic.jazztel.es (HELO localhost.localdomain) (pneira@us.es@95.20.54.25) by us.es with SMTP; 10 Jan 2013 16:28:53 +0100 From: pablo@netfilter.org To: netfilter-devel@vger.kernel.org Cc: kaber@trash.net, tomasz.bursztyka@linux.intel.com Subject: [PATCH 3/7] netfilter: nf_tables: remove hook definitions from struct nft_af_info Date: Thu, 10 Jan 2013 16:28:37 +0100 Message-Id: <1357831721-10182-3-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1357831721-10182-1-git-send-email-pablo@netfilter.org> References: <1357831721-10182-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 They are now included in the filter chain definition. Signed-off-by: Pablo Neira Ayuso --- include/net/netfilter/nf_tables.h | 2 -- net/ipv4/netfilter/nf_tables_ipv4.c | 5 +---- net/ipv6/netfilter/nf_tables_ipv6.c | 5 +---- net/netfilter/nf_tables_api.c | 2 -- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h index 5d9d43f..0dc7d80 100644 --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h @@ -430,7 +430,6 @@ struct nft_table { * @nhooks: number of hooks in this family * @owner: module owner * @tables: used internally - * @hooks: hookfn overrides for packet validation */ struct nft_af_info { struct list_head list; @@ -438,7 +437,6 @@ struct nft_af_info { unsigned int nhooks; struct module *owner; struct list_head tables; - nf_hookfn *hooks[NF_MAX_HOOKS]; }; extern int nft_register_afinfo(struct net *, struct nft_af_info *); diff --git a/net/ipv4/netfilter/nf_tables_ipv4.c b/net/ipv4/netfilter/nf_tables_ipv4.c index a0ee4c2..29e09e9 100644 --- a/net/ipv4/netfilter/nf_tables_ipv4.c +++ b/net/ipv4/netfilter/nf_tables_ipv4.c @@ -38,9 +38,6 @@ static struct nft_af_info nft_af_ipv4 __read_mostly = { .family = NFPROTO_IPV4, .nhooks = NF_INET_NUMHOOKS, .owner = THIS_MODULE, - .hooks = { - [NF_INET_LOCAL_OUT] = nft_ipv4_output, - }, }; static int nf_tables_ipv4_init_net(struct net *net) @@ -82,7 +79,7 @@ static struct nf_chain_type filter_ipv4 = { (1 << NF_INET_POST_ROUTING), .fn = { [NF_INET_LOCAL_IN] = nft_do_chain, - [NF_INET_LOCAL_OUT] = nft_do_chain, + [NF_INET_LOCAL_OUT] = nft_ipv4_output, [NF_INET_FORWARD] = nft_do_chain, [NF_INET_PRE_ROUTING] = nft_do_chain, [NF_INET_POST_ROUTING] = nft_do_chain, diff --git a/net/ipv6/netfilter/nf_tables_ipv6.c b/net/ipv6/netfilter/nf_tables_ipv6.c index e1eee09..84ccd35 100644 --- a/net/ipv6/netfilter/nf_tables_ipv6.c +++ b/net/ipv6/netfilter/nf_tables_ipv6.c @@ -35,9 +35,6 @@ static struct nft_af_info nft_af_ipv6 __read_mostly = { .family = NFPROTO_IPV6, .nhooks = NF_INET_NUMHOOKS, .owner = THIS_MODULE, - .hooks = { - [NF_INET_LOCAL_OUT] = nft_ipv6_output, - }, }; static int nf_tables_ipv6_init_net(struct net *net) @@ -79,7 +76,7 @@ static struct nf_chain_type filter_ipv6 = { (1 << NF_INET_POST_ROUTING), .fn = { [NF_INET_LOCAL_IN] = nft_do_chain, - [NF_INET_LOCAL_OUT] = nft_do_chain, + [NF_INET_LOCAL_OUT] = nft_ipv6_output, [NF_INET_FORWARD] = nft_do_chain, [NF_INET_PRE_ROUTING] = nft_do_chain, [NF_INET_POST_ROUTING] = nft_do_chain, diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index a8ae0b4..697b853 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -842,8 +842,6 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb, ops->priority = ntohl(nla_get_be32(ha[NFTA_HOOK_PRIORITY])); ops->priv = chain; ops->hook = hookfn; - if (afi->hooks[ops->hooknum]) - ops->hook = afi->hooks[ops->hooknum]; chain->flags |= NFT_BASE_CHAIN;