---

yaml --- r: 343354 b: refs/heads/master c: 7bdc1b4 h: refs/heads/master v: v3
git-mirror · Dec 13, 2012 · 52db5f7 · 52db5f7
1 parent 4e74b86
commit 52db5f7
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: 499744209b2cbca66c42119226e5470da3bb7040
+refs/heads/master: 7bdc1b4abab3af0a803300f706c9814ef4e20a3e
diff --git a/trunk/net/ipv6/ndisc.c b/trunk/net/ipv6/ndisc.c
@@ -151,8 +151,8 @@ static inline int ndisc_opt_addr_space(struct net_device *dev)
 static u8 *ndisc_fill_addr_option(u8 *opt, int type, void *data, int data_len,
 				  unsigned short addr_type)
 {
-	int space = NDISC_OPT_SPACE(data_len);
 	int pad   = ndisc_addr_option_pad(addr_type);
+	int space = NDISC_OPT_SPACE(data_len + pad);
 
 	opt[0] = type;
 	opt[1] = space>>3;