[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>
This commit is contained in:

committed by
David S. Miller

parent
d44caf88e8
commit
2fd8e526f4
@@ -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);
|
||||
|
||||
|
Reference in New Issue
Block a user