Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Patrick McHardy and committed by
David S. Miller
2fd8e526 d44caf88

-7
-3
include/linux/skbuff.h
··· 108 108 atomic_t use; 109 109 struct net_device *physindev; 110 110 struct net_device *physoutdev; 111 - #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) 112 - struct net_device *netoutdev; 113 - #endif 114 111 unsigned int mask; 115 112 unsigned long data[32 / sizeof(unsigned long)]; 116 113 };
-4
net/bridge/br_netfilter.c
··· 828 828 nf_bridge_pull_encap_header(skb); 829 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 831 NF_HOOK(pf, NF_INET_POST_ROUTING, skb, NULL, realoutdev, 836 832 br_nf_dev_queue_xmit); 837 833