From bcd982ab9556e47947956f708986beb67cfe2c91 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 13 Nov 2007 02:58:44 -0800
Subject: [PATCH] --- yaml --- r: 73620 b: refs/heads/master c:
 81d9ddae856678c45297550e9353c8a5a7fd6438 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/net/bridge/br_netfilter.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c8424ce2605d..03017e8305b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ce5ba6aecb218981fc76585b6d9a7d0019e61b5
+refs/heads/master: 81d9ddae856678c45297550e9353c8a5a7fd6438
diff --git a/trunk/net/bridge/br_netfilter.c b/trunk/net/bridge/br_netfilter.c
index da22f900e89d..c1757c79dfbb 100644
--- a/trunk/net/bridge/br_netfilter.c
+++ b/trunk/net/bridge/br_netfilter.c
@@ -766,6 +766,9 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff *skb,
 	if (!nf_bridge)
 		return NF_ACCEPT;
 
+	if (!(nf_bridge->mask & (BRNF_BRIDGED | BRNF_BRIDGED_DNAT)))
+		return NF_ACCEPT;
+
 	if (!realoutdev)
 		return NF_DROP;