summaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-11-04 14:31:29 +0100
committerPatrick McHardy <kaber@trash.net>2008-11-04 14:31:29 +0100
commit249b62035ca247b9cedbefa1acf6bdc53b96e678 (patch)
treef47f156c1fe9c1c2c4002feb2bc7de1db751d740 /net/bridge
parentb71b30a626fd0e43c825a05036e7a2c3f377a563 (diff)
downloadop-kernel-dev-249b62035ca247b9cedbefa1acf6bdc53b96e678.zip
op-kernel-dev-249b62035ca247b9cedbefa1acf6bdc53b96e678.tar.gz
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>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_netfilter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index db6176d..bf9d6af 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) {
OpenPOWER on IntegriCloud