From 4e8fe27bd8c8338fa6fb6f7a559a5cb27880afc0 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Thu, 31 Jan 2008 03:56:35 -0800
Subject: [PATCH] --- yaml --- r: 81884 b: refs/heads/master c:
 2fd8e526f44beaf439f351b310648b559e62a7cb h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/skbuff.h    | 3 ---
 trunk/net/bridge/br_netfilter.c | 4 ----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 0089ab0463bf..cbbeb9d08f4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d44caf88e8f7906a4f99dbfc92108d660cfcd280
+refs/heads/master: 2fd8e526f44beaf439f351b310648b559e62a7cb
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index c618fbf7d173..dfe975a9967e 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -108,9 +108,6 @@ struct nf_bridge_info {
 	atomic_t use;
 	struct net_device *physindev;
 	struct net_device *physoutdev;
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-	struct net_device *netoutdev;
-#endif
 	unsigned int mask;
 	unsigned long data[32 / sizeof(unsigned long)];
 };
diff --git a/trunk/net/bridge/br_netfilter.c b/trunk/net/bridge/br_netfilter.c
index 80014bab81b0..1c0efd8ad9f3 100644
--- a/trunk/net/bridge/br_netfilter.c
+++ b/trunk/net/bridge/br_netfilter.c
@@ -828,10 +828,6 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff *skb,
 	nf_bridge_pull_encap_header(skb);
 	nf_bridge_save_header(skb);
 
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-	if (nf_bridge->netoutdev)
-		realoutdev = nf_bridge->netoutdev;
-#endif
 	NF_HOOK(pf, NF_INET_POST_ROUTING, skb, NULL, realoutdev,
 		br_nf_dev_queue_xmit);