---

yaml --- r: 74877 b: refs/heads/master c: 4a9ecd5 h: refs/heads/master i: 74875: 9e872cb v: v3
git-mirror · Dec 14, 2007 · 2d02152 · 2d02152
1 parent ac38f62
commit 2d02152
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f229d76b4c4a7fae601ea9398b23c2b426ab3b9
+refs/heads/master: 4a9ecd5960e6a7814f6e3405807d49010ffe3a88
diff --git a/trunk/include/linux/netfilter_bridge.h b/trunk/include/linux/netfilter_bridge.h
@@ -50,7 +50,8 @@ enum nf_br_hook_priorities {
 extern int nf_bridge_copy_header(struct sk_buff *skb);
 static inline int nf_bridge_maybe_copy_header(struct sk_buff *skb)
 {
-	if (skb->nf_bridge)
+	if (skb->nf_bridge &&
+	    skb->nf_bridge->mask & (BRNF_BRIDGED | BRNF_BRIDGED_DNAT))
 		return nf_bridge_copy_header(skb);
   	return 0;
 }