From 52db5f77bb2a064883cf67d72c73fd8f3deff17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?= =?UTF-8?q?=E6=98=8E?= Date: Thu, 13 Dec 2012 04:29:36 +0000 Subject: [PATCH] --- yaml --- r: 343354 b: refs/heads/master c: 7bdc1b4abab3af0a803300f706c9814ef4e20a3e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv6/ndisc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 080b49ef9f56..cfed8b1e0df1 100644 --- 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 index 4c02e6ab96e7..f2a007b7bde3 100644 --- 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;