diff options
-rw-r--r-- | include/linux/skbuff.h | 3 | ||||
-rw-r--r-- | net/bridge/br_netfilter.c | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index c618fbf7d173..dfe975a9967e 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -108,9 +108,6 @@ struct nf_bridge_info { | |||
108 | atomic_t use; | 108 | atomic_t use; |
109 | struct net_device *physindev; | 109 | struct net_device *physindev; |
110 | struct net_device *physoutdev; | 110 | struct net_device *physoutdev; |
111 | #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) | ||
112 | struct net_device *netoutdev; | ||
113 | #endif | ||
114 | unsigned int mask; | 111 | unsigned int mask; |
115 | unsigned long data[32 / sizeof(unsigned long)]; | 112 | unsigned long data[32 / sizeof(unsigned long)]; |
116 | }; | 113 | }; |
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 80014bab81b0..1c0efd8ad9f3 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
@@ -828,10 +828,6 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff *skb, | |||
828 | nf_bridge_pull_encap_header(skb); | 828 | nf_bridge_pull_encap_header(skb); |
829 | nf_bridge_save_header(skb); | 829 | nf_bridge_save_header(skb); |
830 | 830 | ||
831 | #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) | ||
832 | if (nf_bridge->netoutdev) | ||
833 | realoutdev = nf_bridge->netoutdev; | ||
834 | #endif | ||
835 | NF_HOOK(pf, NF_INET_POST_ROUTING, skb, NULL, realoutdev, | 831 | NF_HOOK(pf, NF_INET_POST_ROUTING, skb, NULL, realoutdev, |
836 | br_nf_dev_queue_xmit); | 832 | br_nf_dev_queue_xmit); |
837 | 833 | ||