netfilter: bridge: reduce nf_bridge_info to 32 bytes again

Browse source

We can use union for most of the temporary cruft (original ipv4/ipv6
address, source mac, physoutdev) since they're used during different
stages of br netfilter traversal.

Also get rid of the last two ->mask users.

Shrinks struct from 48 to 32 on 64bit arch.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

...

This commit is contained in:

Florian Westphal 2015-07-23 16:21:30 +02:00 • committed by Pablo Neira Ayuso

parent d7ee351904

commit 72b1e5e4ca

6 changed files with 33 additions and 28 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

include/linux/netfilter_bridge.h

View file

19

include/linux/skbuff.h

View file

14

net/bridge/br_netfilter_hooks.c

View file

2

net/bridge/br_netfilter_ipv6.c

View file

7

net/ipv4/netfilter/nf_defrag_ipv4.c

View file

7

net/ipv6/netfilter/nf_defrag_ipv6_hooks.c

View file