Commit 24c232d8 authored by Jan Engelhardt's avatar Jan Engelhardt
Browse files

netfilter: xtables: switch hook PFs to nfproto 



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

net/bridge/netfilter/ebtable_filter.c

+3 −3
Original line number Diff line number Diff line
@@ -77,21 +77,21 @@ static struct nf_hook_ops ebt_ops_filter[] __read_mostly = { 
	{

		.hook		= ebt_in_hook,

		.owner		= THIS_MODULE,

		.pf		= PF_BRIDGE,

		.pf		= NFPROTO_BRIDGE,

		.hooknum	= NF_BR_LOCAL_IN,

		.priority	= NF_BR_PRI_FILTER_BRIDGED,

	},

	{

		.hook		= ebt_in_hook,

		.owner		= THIS_MODULE,

		.pf		= PF_BRIDGE,

		.pf		= NFPROTO_BRIDGE,

		.hooknum	= NF_BR_FORWARD,

		.priority	= NF_BR_PRI_FILTER_BRIDGED,

	},

	{

		.hook		= ebt_out_hook,

		.owner		= THIS_MODULE,

		.pf		= PF_BRIDGE,

		.pf		= NFPROTO_BRIDGE,

		.hooknum	= NF_BR_LOCAL_OUT,

		.priority	= NF_BR_PRI_FILTER_OTHER,

	},

net/bridge/netfilter/ebtable_nat.c

+3 −3
Original line number Diff line number Diff line
@@ -77,21 +77,21 @@ static struct nf_hook_ops ebt_ops_nat[] __read_mostly = { 
	{

		.hook		= ebt_nat_out,

		.owner		= THIS_MODULE,

		.pf		= PF_BRIDGE,

		.pf		= NFPROTO_BRIDGE,

		.hooknum	= NF_BR_LOCAL_OUT,

		.priority	= NF_BR_PRI_NAT_DST_OTHER,

	},

	{

		.hook		= ebt_nat_out,

		.owner		= THIS_MODULE,

		.pf		= PF_BRIDGE,

		.pf		= NFPROTO_BRIDGE,

		.hooknum	= NF_BR_POST_ROUTING,

		.priority	= NF_BR_PRI_NAT_SRC,

	},

	{

		.hook		= ebt_nat_in,

		.owner		= THIS_MODULE,

		.pf		= PF_BRIDGE,

		.pf		= NFPROTO_BRIDGE,

		.hooknum	= NF_BR_PRE_ROUTING,

		.priority	= NF_BR_PRI_NAT_DST_BRIDGED,

	},

net/ipv4/netfilter/iptable_filter.c

+3 −3
Original line number Diff line number Diff line
@@ -102,21 +102,21 @@ static struct nf_hook_ops ipt_ops[] __read_mostly = { 
	{

		.hook		= ipt_local_in_hook,

		.owner		= THIS_MODULE,

		.pf		= PF_INET,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_LOCAL_IN,

		.priority	= NF_IP_PRI_FILTER,

	},

	{

		.hook		= ipt_hook,

		.owner		= THIS_MODULE,

		.pf		= PF_INET,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_FORWARD,

		.priority	= NF_IP_PRI_FILTER,

	},

	{

		.hook		= ipt_local_out_hook,

		.owner		= THIS_MODULE,

		.pf		= PF_INET,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_LOCAL_OUT,

		.priority	= NF_IP_PRI_FILTER,

	},

net/ipv4/netfilter/iptable_mangle.c

+5 −5
Original line number Diff line number Diff line
@@ -162,35 +162,35 @@ static struct nf_hook_ops ipt_ops[] __read_mostly = { 
	{

		.hook		= ipt_pre_routing_hook,

		.owner		= THIS_MODULE,

		.pf		= PF_INET,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_PRE_ROUTING,

		.priority	= NF_IP_PRI_MANGLE,

	},

	{

		.hook		= ipt_local_in_hook,

		.owner		= THIS_MODULE,

		.pf		= PF_INET,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_LOCAL_IN,

		.priority	= NF_IP_PRI_MANGLE,

	},

	{

		.hook		= ipt_forward_hook,

		.owner		= THIS_MODULE,

		.pf		= PF_INET,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_FORWARD,

		.priority	= NF_IP_PRI_MANGLE,

	},

	{

		.hook		= ipt_local_hook,

		.owner		= THIS_MODULE,

		.pf		= PF_INET,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_LOCAL_OUT,

		.priority	= NF_IP_PRI_MANGLE,

	},

	{

		.hook		= ipt_post_routing_hook,

		.owner		= THIS_MODULE,

		.pf		= PF_INET,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_POST_ROUTING,

		.priority	= NF_IP_PRI_MANGLE,

	},

net/ipv4/netfilter/iptable_raw.c

+2 −2
Original line number Diff line number Diff line
@@ -74,14 +74,14 @@ ipt_local_hook(unsigned int hook, 
static struct nf_hook_ops ipt_ops[] __read_mostly = {

	{

		.hook = ipt_hook,

		.pf = PF_INET,

		.pf = NFPROTO_IPV4,

		.hooknum = NF_INET_PRE_ROUTING,

		.priority = NF_IP_PRI_RAW,

		.owner = THIS_MODULE,

	},

	{

		.hook = ipt_local_hook,

		.pf = PF_INET,

		.pf = NFPROTO_IPV4,

		.hooknum = NF_INET_LOCAL_OUT,

		.priority = NF_IP_PRI_RAW,

		.owner = THIS_MODULE,