---

yaml --- r: 34457 b: refs/heads/master c: d924424 h: refs/heads/master i: 34455: 1923485 v: v3
git-mirror · Sep 22, 2006 · e76c3e1 · e76c3e1
1 parent 3604ab9
commit e76c3e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);