Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[~andy/linux] / include / net / neighbour.h

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 0dab173e27da6e8e66a8eea4913f5b0230f612bd..7e748ad8b50c71900bdcedaf09a8c69e41f567a3 100644 (file)
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -181,10 +181,11 @@ 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)
 {
-       return (char *)n + ALIGN(sizeof(*n) + n->tbl->key_len, NEIGH_PRIV_ALIGN);
+       return (char *)n + n->tbl->entry_size;
 }
 
 /* flags for neigh_update() */