From e76c3e1f6cf36688252592825682eafcff788dc2 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Thu, 10 Aug 2006 23:03:23 -0700
Subject: [PATCH] --- yaml --- r: 34457 b: refs/heads/master c:
 d924424aaed116b362c6d0e667d912b77e655085 h: refs/heads/master i:   34455:
 19234852ca2555701d8564baa2075cf9d612b6a9 v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/neighbour.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 53bb8809d01e..2ce4cd4ed4e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e38bb3a38d08129d08c904b10ea3ba08e22d297
+refs/heads/master: d924424aaed116b362c6d0e667d912b77e655085
diff --git a/trunk/include/net/neighbour.h b/trunk/include/net/neighbour.h
index 74c4b6ff8a5c..bd187daffdb9 100644
--- a/trunk/include/net/neighbour.h
+++ b/trunk/include/net/neighbour.h
@@ -101,7 +101,7 @@ struct neighbour
 	__u8			dead;
 	atomic_t		probes;
 	rwlock_t		lock;
-	unsigned char		ha[(MAX_ADDR_LEN+sizeof(unsigned long)-1)&~(sizeof(unsigned long)-1)];
+	unsigned char		ha[ALIGN(MAX_ADDR_LEN, sizeof(unsigned long))];
 	struct hh_cache		*hh;
 	atomic_t		refcnt;
 	int			(*output)(struct sk_buff *skb);