From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Tue, 4 Nov 2008 13:31:29 +0000 (+0100)
Subject: netfilter: netns ebtables: br_nf_pre_routing_finish() fixup
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=249b62035ca247b9cedbefa1acf6bdc53b96e678;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

netfilter: netns ebtables: br_nf_pre_routing_finish() fixup

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index db6176d96e71..bf9d6af9628a 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -357,7 +357,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
 			if (err != -EHOSTUNREACH || !in_dev || IN_DEV_FORWARD(in_dev))
 				goto free_skb;
 
-			if (!ip_route_output_key(&init_net, &rt, &fl)) {
+			if (!ip_route_output_key(dev_net(dev), &rt, &fl)) {
 				/* - Bridged-and-DNAT'ed traffic doesn't
 				 *   require ip_forwarding. */
 				if (((struct dst_entry *)rt)->dev == dev) {