Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57750a22 authored by Jan Engelhardt's avatar Jan Engelhardt
Browse files

netfilter: conntrack: switch hook PFs to nfproto 



Simple substitution to indicate that the fields indeed use the
NFPROTO_ space.

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent 93bb1e9d

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+4 −4
Original line number Diff line number Diff line
@@ -158,28 +158,28 @@ static struct nf_hook_ops ipv4_conntrack_ops[] __read_mostly = { 
	{

		.hook		= ipv4_conntrack_in,

		.owner		= THIS_MODULE,

		.pf		= PF_INET,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_PRE_ROUTING,

		.priority	= NF_IP_PRI_CONNTRACK,

	},

	{

		.hook		= ipv4_conntrack_local,

		.owner		= THIS_MODULE,

		.pf		= PF_INET,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_LOCAL_OUT,

		.priority	= NF_IP_PRI_CONNTRACK,

	},

	{

		.hook		= ipv4_confirm,

		.owner		= THIS_MODULE,

		.pf		= PF_INET,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_POST_ROUTING,

		.priority	= NF_IP_PRI_CONNTRACK_CONFIRM,

	},

	{

		.hook		= ipv4_confirm,

		.owner		= THIS_MODULE,

		.pf		= PF_INET,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_LOCAL_IN,

		.priority	= NF_IP_PRI_CONNTRACK_CONFIRM,

	},

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

+6 −6
Original line number Diff line number Diff line
@@ -265,42 +265,42 @@ static struct nf_hook_ops ipv6_conntrack_ops[] __read_mostly = { 
	{

		.hook		= ipv6_defrag,

		.owner		= THIS_MODULE,

		.pf		= PF_INET6,

		.pf		= NFPROTO_IPV6,

		.hooknum	= NF_INET_PRE_ROUTING,

		.priority	= NF_IP6_PRI_CONNTRACK_DEFRAG,

	},

	{

		.hook		= ipv6_conntrack_in,

		.owner		= THIS_MODULE,

		.pf		= PF_INET6,

		.pf		= NFPROTO_IPV6,

		.hooknum	= NF_INET_PRE_ROUTING,

		.priority	= NF_IP6_PRI_CONNTRACK,

	},

	{

		.hook		= ipv6_conntrack_local,

		.owner		= THIS_MODULE,

		.pf		= PF_INET6,

		.pf		= NFPROTO_IPV6,

		.hooknum	= NF_INET_LOCAL_OUT,

		.priority	= NF_IP6_PRI_CONNTRACK,

	},

	{

		.hook		= ipv6_defrag,

		.owner		= THIS_MODULE,

		.pf		= PF_INET6,

		.pf		= NFPROTO_IPV6,

		.hooknum	= NF_INET_LOCAL_OUT,

		.priority	= NF_IP6_PRI_CONNTRACK_DEFRAG,

	},

	{

		.hook		= ipv6_confirm,

		.owner		= THIS_MODULE,

		.pf		= PF_INET6,

		.pf		= NFPROTO_IPV6,

		.hooknum	= NF_INET_POST_ROUTING,

		.priority	= NF_IP6_PRI_LAST,

	},

	{

		.hook		= ipv6_confirm,

		.owner		= THIS_MODULE,

		.pf		= PF_INET6,

		.pf		= NFPROTO_IPV6,

		.hooknum	= NF_INET_LOCAL_IN,

		.priority	= NF_IP6_PRI_LAST-1,

	},