[PATCH 15/15] br_netfilter: switch sysctl pass_vlan_indev to per-netns processing

[Vasily Averin <vvs@parallels.com>]

Signed-off-by: Vasily Averin <vvs@openvz.org>
---
 net/bridge/br_netfilter.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 44bae8e..5ca6010 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -532,9 +532,11 @@ bridged_dnat:
 static struct net_device *brnf_get_logical_dev(struct sk_buff *skb, const struct net_device *dev)
 {
 	struct net_device *vlan, *br;
+	struct brnf_net *bn;
 
 	br = bridge_parent(dev);
-	if (init_brnf_net.pass_vlan_indev == 0 || !vlan_tx_tag_present(skb))
+	bn = brnf_net(dev_net(dev));
+	if (bn->pass_vlan_indev == 0 || !vlan_tx_tag_present(skb))
 		return br;
 
 	vlan = __vlan_find_dev_deep(br, skb->vlan_proto,
@@ -1077,7 +1079,7 @@ static int brnf_sysctl_net_register(struct brnf_net *bn)
 		if (!table)
 			goto err_alloc;
 	}
-	for (i = 0; i < 5; i++)
+	for (i = 0; table[i].data; i++)
 		table[i].data += (char *)bn - (char *)&init_brnf_net;
 
 	hdr = register_net_sysctl(bn->net, "net/bridge", table);
-- 
1.7.5.4