From: David Ahern <dsah...@gmail.com>

Move arp_queue_len_bytes ahead of arp_queue to remove two 4-byte holes.
Ensure ha element is always 8-byte aligned.

Signed-off-by: David Ahern <dsah...@gmail.com>
---
 include/net/neighbour.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index ef0a60448a96..30fd50adf234 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -140,8 +140,8 @@ struct neighbour {
        unsigned long           updated;
        rwlock_t                lock;
        refcount_t              refcnt;
-       struct sk_buff_head     arp_queue;
        unsigned int            arp_queue_len_bytes;
+       struct sk_buff_head     arp_queue;
        struct timer_list       timer;
        unsigned long           used;
        atomic_t                probes;
@@ -150,7 +150,7 @@ struct neighbour {
        __u8                    type;
        __u8                    dead;
        seqlock_t               ha_lock;
-       unsigned char           ha[ALIGN(MAX_ADDR_LEN, sizeof(unsigned long))];
+       unsigned char           ha[ALIGN(MAX_ADDR_LEN, sizeof(unsigned long))] 
__aligned(8);
        struct hh_cache         hh;
        int                     (*output)(struct neighbour *, struct sk_buff *);
        const struct neigh_ops  *ops;
-- 
2.11.0

Reply via email to