netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: pablo@netfilter.org
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 23/25] netfilter: ipv4, defrag: switch hook PFs to nfproto
Date: Mon, 11 Jun 2012 16:43:59 +0200	[thread overview]
Message-ID: <1339425841-24171-24-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1339425841-24171-1-git-send-email-pablo@netfilter.org>

From: Alban Crequy <alban.crequy@collabora.co.uk>

This patch is a cleanup. Use NFPROTO_* for consistency with other
netfilter code.

Signed-off-by: Alban Crequy <alban.crequy@collabora.co.uk>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Reviewed-by: Vincent Sanders <vincent.sanders@collabora.co.uk>
---
 net/ipv4/netfilter/nf_defrag_ipv4.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv4/netfilter/nf_defrag_ipv4.c b/net/ipv4/netfilter/nf_defrag_ipv4.c
index 9bb1b8a..7428155 100644
--- a/net/ipv4/netfilter/nf_defrag_ipv4.c
+++ b/net/ipv4/netfilter/nf_defrag_ipv4.c
@@ -94,14 +94,14 @@ static struct nf_hook_ops ipv4_defrag_ops[] = {
 	{
 		.hook		= ipv4_conntrack_defrag,
 		.owner		= THIS_MODULE,
-		.pf		= PF_INET,
+		.pf		= NFPROTO_IPV4,
 		.hooknum	= NF_INET_PRE_ROUTING,
 		.priority	= NF_IP_PRI_CONNTRACK_DEFRAG,
 	},
 	{
 		.hook           = ipv4_conntrack_defrag,
 		.owner          = THIS_MODULE,
-		.pf             = PF_INET,
+		.pf             = NFPROTO_IPV4,
 		.hooknum        = NF_INET_LOCAL_OUT,
 		.priority       = NF_IP_PRI_CONNTRACK_DEFRAG,
 	},
-- 
1.7.10


  parent reply	other threads:[~2012-06-11 14:45 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-11 14:43 [PATCH 00/25] netfilter updates from net-next (upcoming 3.6) pablo
2012-06-11 14:43 ` [PATCH 01/25] netfilter: remove include/linux/netfilter_ipv4/ipt_addrtype.h pablo
2012-06-11 14:43 ` [PATCH 02/25] netfilter: xt_connlimit: remove revision 0 pablo
2012-06-11 14:43 ` [PATCH 03/25] netfilter: Add fail-open support pablo
2012-06-11 14:43 ` [PATCH 04/25] netfilter: nf_conntrack: prepare namespace support for l4 protocol trackers pablo
2012-06-11 14:43 ` [PATCH 05/25] netfilter: nf_conntrack: prepare namespace support for l3 " pablo
2012-06-11 14:43 ` [PATCH 06/25] netfilter: nf_ct_generic: add namespace support pablo
2012-06-11 14:43 ` [PATCH 07/25] netfilter: nf_ct_tcp: " pablo
2012-06-11 14:43 ` [PATCH 08/25] netfilter: nf_ct_udp: " pablo
2012-06-11 14:43 ` [PATCH 09/25] netfilter: nf_ct_icmp: " pablo
2012-06-11 14:43 ` [PATCH 10/25] " pablo
2012-06-11 14:43 ` [PATCH 11/25] netfilter: nf_ct_ipv4: " pablo
2012-06-11 14:43 ` [PATCH 12/25] netfilter: nf_ct_ipv6: " pablo
2012-06-11 14:43 ` [PATCH 13/25] netfilter: nf_ct_sctp: " pablo
2012-06-11 14:43 ` [PATCH 14/25] netfilter: nf_ct_udplite: " pablo
2012-06-11 14:43 ` [PATCH 15/25] netfilter: nf_ct_dccp: use new " pablo
2012-06-11 14:43 ` [PATCH 16/25] netfilter: nf_ct_gre: " pablo
2012-06-11 14:43 ` [PATCH 17/25] netfilter: nf_conntrack: remove now unused sysctl for nf_conntrack_l[3|4]proto pablo
2012-06-11 14:43 ` [PATCH 18/25] netfilter: nf_conntrack: add namespace support for cttimeout pablo
2012-06-11 14:43 ` [PATCH 19/25] netfilter: NFQUEUE: don't xor src/dst ip address for load distribution pablo
2012-06-11 14:43 ` [PATCH 20/25] netfilter: xt_recent: add address masking option pablo
2012-06-11 14:43 ` [PATCH 21/25] netfilter: decnet: switch hook PFs to nfproto pablo
2012-06-11 14:43 ` [PATCH 22/25] netfilter: bridge: " pablo
2012-06-11 14:43 ` pablo [this message]
2012-06-11 14:44 ` [PATCH 24/25] netfilter: ipvs: " pablo
2012-06-11 14:44 ` [PATCH 25/25] netfilter: selinux: " pablo
2012-06-11 20:08 ` [PATCH 00/25] netfilter updates from net-next (upcoming 3.6) David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1339425841-24171-24-git-send-email-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).