diff options
author | Denis V. Lunev <den@openvz.org> | 2008-01-23 01:07:34 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:11:07 -0500 |
commit | f206351a50ea86250fabea96b9af8d8f8fc02603 (patch) | |
tree | 014148d8b45db1995d98374ec3b30e635f243197 /net/bridge | |
parent | f1b050bf7a88910f9f00c9c8989c1bf5a67dd140 (diff) |
[NETNS]: Add namespace parameter to ip_route_output_key.
Needed to propagate it down to the ip_route_output_flow.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_netfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 141f069e77a0..80014bab81b0 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
@@ -353,7 +353,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb) | |||
353 | if (err != -EHOSTUNREACH || !in_dev || IN_DEV_FORWARD(in_dev)) | 353 | if (err != -EHOSTUNREACH || !in_dev || IN_DEV_FORWARD(in_dev)) |
354 | goto free_skb; | 354 | goto free_skb; |
355 | 355 | ||
356 | if (!ip_route_output_key(&rt, &fl)) { | 356 | if (!ip_route_output_key(&init_net, &rt, &fl)) { |
357 | /* - Bridged-and-DNAT'ed traffic doesn't | 357 | /* - Bridged-and-DNAT'ed traffic doesn't |
358 | * require ip_forwarding. */ | 358 | * require ip_forwarding. */ |
359 | if (((struct dst_entry *)rt)->dev == dev) { | 359 | if (((struct dst_entry *)rt)->dev == dev) { |