Commit bf1ac5ca authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

nf_bridge: remove holes in struct nf_bridge_info

Put use & mask on same location to avoid two holes on 64bit arches
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cbf8f7bb
...@@ -118,9 +118,9 @@ struct nf_conntrack { ...@@ -118,9 +118,9 @@ struct nf_conntrack {
#ifdef CONFIG_BRIDGE_NETFILTER #ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info { struct nf_bridge_info {
atomic_t use; atomic_t use;
unsigned int mask;
struct net_device *physindev; struct net_device *physindev;
struct net_device *physoutdev; struct net_device *physoutdev;
unsigned int mask;
unsigned long data[32 / sizeof(unsigned long)]; unsigned long data[32 / sizeof(unsigned long)];
}; };
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment