---

yaml --- r: 73620 b: refs/heads/master c: 81d9dda h: refs/heads/master v: v3
git-mirror · Nov 13, 2007 · bcd982a · bcd982a
1 parent 7862aae
commit bcd982a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;