summaryrefslogtreecommitdiffstats
path: root/include/linux/skbuff.h
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-01-31 03:56:35 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-31 19:27:29 -0800
commit2fd8e526f44beaf439f351b310648b559e62a7cb (patch)
treeaae812290eef88f76efd682d8e4dd3cde67bd046 /include/linux/skbuff.h
parentd44caf88e8f7906a4f99dbfc92108d660cfcd280 (diff)
downloadop-kernel-dev-2fd8e526f44beaf439f351b310648b559e62a7cb.zip
op-kernel-dev-2fd8e526f44beaf439f351b310648b559e62a7cb.tar.gz
[NETFILTER]: bridge netfilter: remove nf_bridge_info read-only netoutdev member
Before the removal of the deferred output hooks, netoutdev was used in case of VLANs on top of a bridge to store the VLAN device, so the deferred hooks would see the correct output device. This isn't necessary anymore since we're calling the output hooks for the correct device directly in the IP stack. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r--include/linux/skbuff.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index c618fbf..dfe975a 100644
--- a/include/linux/skbuff.h
+++ b/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)];
};
OpenPOWER on IntegriCloud