---

yaml --- r: 78311 b: refs/heads/master c: 7a6c665 h: refs/heads/master i: 78309: a4f2f06 78307: a795ffc 78303: 2cf6fc5 v: v3
git-mirror · Jan 28, 2008 · 07e5201 · 07e5201
1 parent 9fea062
commit 07e5201
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 171b7fc4fc178a004aec8d06eb745c30ae726fb6
+refs/heads/master: 7a6c6653b3a977087ec64d76817c7ee6e1df5b60
diff --git a/trunk/net/ipv6/netfilter/ip6_queue.c b/trunk/net/ipv6/netfilter/ip6_queue.c
@@ -418,7 +418,16 @@ dev_cmp(struct ipq_queue_entry *entry, unsigned long ifindex)
 	if (entry->info->outdev)
 		if (entry->info->outdev->ifindex == ifindex)
 			return 1;
-
+#ifdef CONFIG_BRIDGE_NETFILTER
+	if (entry->skb->nf_bridge) {
+		if (entry->skb->nf_bridge->physindev &&
+		    entry->skb->nf_bridge->physindev->ifindex == ifindex)
+			return 1;
+		if (entry->skb->nf_bridge->physoutdev &&
+		    entry->skb->nf_bridge->physoutdev->ifindex == ifindex)
+			return 1;
+	}
+#endif
 	return 0;
 }