Signed-off-by: Vasily Averin <vvs@xxxxxxxxxx> --- net/bridge/br_netfilter.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 680d60d..44bae8e 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -106,12 +106,12 @@ static inline __be16 pppoe_proto(const struct sk_buff *skb) #define IS_PPPOE_IP(skb) \ (skb->protocol == htons(ETH_P_PPP_SES) && \ pppoe_proto(skb) == htons(PPP_IP) && \ - init_brnf_net.filter_pppoe_tagged) + brnf_net(dev_net(skb->dev))->filter_pppoe_tagged) #define IS_PPPOE_IPV6(skb) \ (skb->protocol == htons(ETH_P_PPP_SES) && \ pppoe_proto(skb) == htons(PPP_IPV6) && \ - init_brnf_net.filter_pppoe_tagged) + brnf_net(dev_net(skb->dev))->filter_pppoe_tagged) static void fake_update_pmtu(struct dst_entry *dst, struct sock *sk, struct sk_buff *skb, u32 mtu) @@ -1077,7 +1077,7 @@ static int brnf_sysctl_net_register(struct brnf_net *bn) if (!table) goto err_alloc; } - for (i = 0; i < 4; i++) + for (i = 0; i < 5; i++) table[i].data += (char *)bn - (char *)&init_brnf_net; hdr = register_net_sysctl(bn->net, "net/bridge", table); -- 1.7.5.4 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
