diff --git a/[refs] b/[refs]
index 01c43c83034b..0996e9d461ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec16ef2228829698fdbd2f6b160ff52551a6bf8a
+refs/heads/master: daaba4fa17d7826807b0b131f796543b4099ef4a
diff --git a/trunk/include/net/neighbour.h b/trunk/include/net/neighbour.h
index 629ee573c6d0..7e748ad8b50c 100644
--- a/trunk/include/net/neighbour.h
+++ b/trunk/include/net/neighbour.h
@@ -181,6 +181,7 @@ struct neigh_table {
 };
 
 #define NEIGH_PRIV_ALIGN	sizeof(long long)
+#define NEIGH_ENTRY_SIZE(size)	ALIGN((size), NEIGH_PRIV_ALIGN)
 
 static inline void *neighbour_priv(const struct neighbour *n)
 {
diff --git a/trunk/net/decnet/dn_neigh.c b/trunk/net/decnet/dn_neigh.c
index 3aede1b459fd..856636addd76 100644
--- a/trunk/net/decnet/dn_neigh.c
+++ b/trunk/net/decnet/dn_neigh.c
@@ -95,7 +95,7 @@ static u32 dn_neigh_hash(const void *pkey,
 
 struct neigh_table dn_neigh_table = {
 	.family =			PF_DECnet,
-	.entry_size =			sizeof(struct dn_neigh),
+	.entry_size =			NEIGH_ENTRY_SIZE(sizeof(struct dn_neigh)),
 	.key_len =			sizeof(__le16),
 	.hash =				dn_neigh_hash,
 	.constructor =			dn_neigh_construct,