From patchwork Wed Oct 15 04:23:57 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Dobriyan X-Patchwork-Id: 4562 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 032CDDDDD8 for ; Wed, 15 Oct 2008 15:21:09 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751820AbYJOEVE (ORCPT ); Wed, 15 Oct 2008 00:21:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751789AbYJOEVB (ORCPT ); Wed, 15 Oct 2008 00:21:01 -0400 Received: from ey-out-2122.google.com ([74.125.78.26]:46427 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751617AbYJOEVA (ORCPT ); Wed, 15 Oct 2008 00:21:00 -0400 Received: by ey-out-2122.google.com with SMTP id 6so914727eyi.37 for ; Tue, 14 Oct 2008 21:20:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=wjGTXXQOlQB++ivBWsUGTy8vTIEwjNUao03+xl0Z9yc=; b=VHiFbsOyrJVqo0ncb1Csh+VvqV6jxE5Q6qsvSKkcFy9B3xplsnpQdEkHQmGMhZhxpy QUgR3sMdXkfC0zs2R5+MVBAjipmahtnE7+l//onzLYhmnvpcwJLrnPnWrN3g6UVUkYdM EErTpNBTJn5S9nM2cJqM9ytxpRhMey5LQxKzM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=PY6u2r2ZqZ59OFIsjYrkh8/KOQ2bfc6oL8RpaQH4VW0Vuxscq+c/RZDP3KQGmyo2ZS 2deYjrorCkd/MulAA5bboOoxDVRQro/aLMke3D1Lo08wwyJ3G8gwFvPS1U7GXCRGT6y4 dpMgCMHSPiH36L3XleM3H9n+ACZv6V4uuue+s= Received: by 10.210.11.13 with SMTP id 13mr572670ebk.68.1224044458942; Tue, 14 Oct 2008 21:20:58 -0700 (PDT) Received: from localhost (gw.zunet.ru [217.67.117.64]) by mx.google.com with ESMTPS id k10sm7446943nfh.25.2008.10.14.21.20.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 14 Oct 2008 21:20:57 -0700 (PDT) Date: Wed, 15 Oct 2008 08:23:57 +0400 From: Alexey Dobriyan To: kaber@trash.net Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, containers@osdl.org Subject: [PATCH 7/7] netns ebtables: br_nf_pre_routing_finish() fixup Message-ID: <20081015042357.GK24058@x200.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexey Dobriyan --- net/bridge/br_netfilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 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) {