diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-01-31 03:56:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-31 19:27:29 -0800 |
| commit | 2fd8e526f44beaf439f351b310648b559e62a7cb (patch) | |
| tree | aae812290eef88f76efd682d8e4dd3cde67bd046 /net/bridge | |
| parent | d44caf88e8f7906a4f99dbfc92108d660cfcd280 (diff) | |
| download | op-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 'net/bridge')
| -rw-r--r-- | net/bridge/br_netfilter.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 80014ba..1c0efd8 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, 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); |
