---

yaml --- r: 122368 b: refs/heads/master c: 249b620 h: refs/heads/master v: v3
git-mirror · Nov 4, 2008 · 94c4a3b · 94c4a3b
1 parent b6d9ffb
commit 94c4a3b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b71b30a626fd0e43c825a05036e7a2c3f377a563
+refs/heads/master: 249b62035ca247b9cedbefa1acf6bdc53b96e678
diff --git a/trunk/net/bridge/br_netfilter.c b/trunk/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) {