---

yaml --- r: 352391 b: refs/heads/master c: daaba4f h: refs/heads/master i: 352389: a4c388f 352387: 919d5da 352383: 5291ac2 v: v3
git-mirror · Feb 11, 2013 · e12244e · e12244e
1 parent a3df130
commit e12244e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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,
-Original file line number
+Diff line change
@@ Expand Up / @@ -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)
     {
@@ Expand Down @@