lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nf_bridge: remove holes in struct nf_bridge_info

Browse Source 
Put use & mask on same location to avoid two holes on 64bit arches

Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet
2012-04-18 23:19:25 +00:00
committed by David S. Miller
parent cbf8f7bb20
commit bf1ac5ca6f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/skbuff.h
View File

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