Commit 1490fd89 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by David S. Miller

net, bridge: align br_nf_ops assignment

No functional change -- just for easier reading.
Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6650613d
...@@ -905,46 +905,62 @@ static unsigned int ip_sabotage_in(unsigned int hook, struct sk_buff *skb, ...@@ -905,46 +905,62 @@ static unsigned int ip_sabotage_in(unsigned int hook, struct sk_buff *skb,
* For br_nf_post_routing, we need (prio = NF_BR_PRI_LAST), because * For br_nf_post_routing, we need (prio = NF_BR_PRI_LAST), because
* ip_refrag() can return NF_STOLEN. */ * ip_refrag() can return NF_STOLEN. */
static struct nf_hook_ops br_nf_ops[] __read_mostly = { static struct nf_hook_ops br_nf_ops[] __read_mostly = {
{ .hook = br_nf_pre_routing, {
.owner = THIS_MODULE, .hook = br_nf_pre_routing,
.pf = PF_BRIDGE, .owner = THIS_MODULE,
.hooknum = NF_BR_PRE_ROUTING, .pf = PF_BRIDGE,
.priority = NF_BR_PRI_BRNF, }, .hooknum = NF_BR_PRE_ROUTING,
{ .hook = br_nf_local_in, .priority = NF_BR_PRI_BRNF,
.owner = THIS_MODULE, },
.pf = PF_BRIDGE, {
.hooknum = NF_BR_LOCAL_IN, .hook = br_nf_local_in,
.priority = NF_BR_PRI_BRNF, }, .owner = THIS_MODULE,
{ .hook = br_nf_forward_ip, .pf = PF_BRIDGE,
.owner = THIS_MODULE, .hooknum = NF_BR_LOCAL_IN,
.pf = PF_BRIDGE, .priority = NF_BR_PRI_BRNF,
.hooknum = NF_BR_FORWARD, },
.priority = NF_BR_PRI_BRNF - 1, }, {
{ .hook = br_nf_forward_arp, .hook = br_nf_forward_ip,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pf = PF_BRIDGE, .pf = PF_BRIDGE,
.hooknum = NF_BR_FORWARD, .hooknum = NF_BR_FORWARD,
.priority = NF_BR_PRI_BRNF, }, .priority = NF_BR_PRI_BRNF - 1,
{ .hook = br_nf_local_out, },
.owner = THIS_MODULE, {
.pf = PF_BRIDGE, .hook = br_nf_forward_arp,
.hooknum = NF_BR_LOCAL_OUT, .owner = THIS_MODULE,
.priority = NF_BR_PRI_FIRST, }, .pf = PF_BRIDGE,
{ .hook = br_nf_post_routing, .hooknum = NF_BR_FORWARD,
.owner = THIS_MODULE, .priority = NF_BR_PRI_BRNF,
.pf = PF_BRIDGE, },
.hooknum = NF_BR_POST_ROUTING, {
.priority = NF_BR_PRI_LAST, }, .hook = br_nf_local_out,
{ .hook = ip_sabotage_in, .owner = THIS_MODULE,
.owner = THIS_MODULE, .pf = PF_BRIDGE,
.pf = PF_INET, .hooknum = NF_BR_LOCAL_OUT,
.hooknum = NF_INET_PRE_ROUTING, .priority = NF_BR_PRI_FIRST,
.priority = NF_IP_PRI_FIRST, }, },
{ .hook = ip_sabotage_in, {
.owner = THIS_MODULE, .hook = br_nf_post_routing,
.pf = PF_INET6, .owner = THIS_MODULE,
.hooknum = NF_INET_PRE_ROUTING, .pf = PF_BRIDGE,
.priority = NF_IP6_PRI_FIRST, }, .hooknum = NF_BR_POST_ROUTING,
.priority = NF_BR_PRI_LAST,
},
{
.hook = ip_sabotage_in,
.owner = THIS_MODULE,
.pf = PF_INET,
.hooknum = NF_INET_PRE_ROUTING,
.priority = NF_IP_PRI_FIRST,
},
{
.hook = ip_sabotage_in,
.owner = THIS_MODULE,
.pf = PF_INET6,
.hooknum = NF_INET_PRE_ROUTING,
.priority = NF_IP6_PRI_FIRST,
},
}; };
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment