From 07e5201b82748e761d83ce6dd991888c0cd418fa Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 5 Dec 2007 01:26:18 -0800
Subject: [PATCH] --- yaml --- r: 78311 b: refs/heads/master c:
 7a6c6653b3a977087ec64d76817c7ee6e1df5b60 h: refs/heads/master i:   78309:
 a4f2f06843afefd8db971f0fffb7e05fedfe57f3   78307:
 a795ffc95e772305d841281b3a59bcf9c88945f7   78303:
 2cf6fc5bb9d973469646958910db8feba0454ed8 v: v3

---
 [refs]                               |  2 +-
 trunk/net/ipv6/netfilter/ip6_queue.c | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 02dfde5eac99..fe26f2b086f2 100644
--- 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
index 7d0780d02d0b..9c50cb19b39b 100644
--- 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;
 }