Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fd8e526 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[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: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d44caf88

include/linux/skbuff.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -108,9 +108,6 @@ struct nf_bridge_info { 
	atomic_t use;

	atomic_t use;

	struct net_device *physindev;

	struct net_device *physindev;

	struct net_device *physoutdev;

	struct net_device *physoutdev;

#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)

	struct net_device *netoutdev;

#endif

	unsigned int mask;

	unsigned int mask;

	unsigned long data[32 / sizeof(unsigned long)];

	unsigned long data[32 / sizeof(unsigned long)];

};

};

net/bridge/br_netfilter.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -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_pull_encap_header(skb);

	nf_bridge_save_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,

	NF_HOOK(pf, NF_INET_POST_ROUTING, skb, NULL, realoutdev,

		br_nf_dev_queue_xmit);

		br_nf_dev_queue_xmit);