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>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 775292a66fa4d84615e2b3d3d15c84913cc7813b..f25795ca675391fb529a0ba9e45d7d18cfaaa417 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -117,11 +117,11 @@ struct nf_conntrack {
 
 #ifdef CONFIG_BRIDGE_NETFILTER
 struct nf_bridge_info {
-       atomic_t use;
-       struct net_device *physindev;
-       struct net_device *physoutdev;
-       unsigned int mask;
-       unsigned long data[32 / sizeof(unsigned long)];
+       atomic_t                use;
+       unsigned int            mask;
+       struct net_device       *physindev;
+       struct net_device       *physoutdev;
+       unsigned long           data[32 / sizeof(unsigned long)];
 };
 #endif