diff options
author | Eric Dumazet <edumazet@google.com> | 2012-04-18 19:19:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-19 15:18:50 -0400 |
commit | bf1ac5ca6f0dede02635588704d216da474b4baa (patch) | |
tree | c231d5e4baed611d37d70aa34a732c41797e18ff /include/linux/skbuff.h | |
parent | cbf8f7bb200f5dbdc9ce11243431440720db03dc (diff) |
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: Eric Dumazet <edumazet@google.com>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r-- | include/linux/skbuff.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 775292a66fa4..f25795ca6753 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -117,11 +117,11 @@ struct nf_conntrack { | |||
117 | 117 | ||
118 | #ifdef CONFIG_BRIDGE_NETFILTER | 118 | #ifdef CONFIG_BRIDGE_NETFILTER |
119 | struct nf_bridge_info { | 119 | struct nf_bridge_info { |
120 | atomic_t use; | 120 | atomic_t use; |
121 | struct net_device *physindev; | 121 | unsigned int mask; |
122 | struct net_device *physoutdev; | 122 | struct net_device *physindev; |
123 | unsigned int mask; | 123 | struct net_device *physoutdev; |
124 | unsigned long data[32 / sizeof(unsigned long)]; | 124 | unsigned long data[32 / sizeof(unsigned long)]; |
125 | }; | 125 | }; |
126 | #endif | 126 | #endif |
127 | 127 | ||