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

neigh: reorder fields in struct neighbour

On 64bit arches, there are two 32bit holes that we can remove.

sizeof(struct neighbour) shrinks from 0xf8 to 0xf0 bytes
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bb7196d2
...@@ -94,7 +94,7 @@ struct neighbour { ...@@ -94,7 +94,7 @@ struct neighbour {
struct neighbour *next; struct neighbour *next;
struct neigh_table *tbl; struct neigh_table *tbl;
struct neigh_parms *parms; struct neigh_parms *parms;
struct net_device *dev; struct net_device *dev;
unsigned long used; unsigned long used;
unsigned long confirmed; unsigned long confirmed;
unsigned long updated; unsigned long updated;
...@@ -102,11 +102,11 @@ struct neighbour { ...@@ -102,11 +102,11 @@ struct neighbour {
__u8 nud_state; __u8 nud_state;
__u8 type; __u8 type;
__u8 dead; __u8 dead;
atomic_t refcnt;
atomic_t probes; atomic_t probes;
rwlock_t lock; rwlock_t lock;
unsigned char ha[ALIGN(MAX_ADDR_LEN, sizeof(unsigned long))]; unsigned char ha[ALIGN(MAX_ADDR_LEN, sizeof(unsigned long))];
struct hh_cache *hh; struct hh_cache *hh;
atomic_t refcnt;
int (*output)(struct sk_buff *skb); int (*output)(struct sk_buff *skb);
struct sk_buff_head arp_queue; struct sk_buff_head arp_queue;
struct timer_list timer; struct timer_list timer;
...@@ -163,7 +163,7 @@ struct neigh_table { ...@@ -163,7 +163,7 @@ struct neigh_table {
atomic_t entries; atomic_t entries;
rwlock_t lock; rwlock_t lock;
unsigned long last_rand; unsigned long last_rand;
struct kmem_cache *kmem_cachep; struct kmem_cache *kmem_cachep;
struct neigh_statistics __percpu *stats; struct neigh_statistics __percpu *stats;
struct neighbour **hash_buckets; struct neighbour **hash_buckets;
unsigned int hash_mask; unsigned int hash_mask;
......
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