patch-2.2.0-pre8 linux/net/ipv6/ndisc.c

Next file: linux/net/ipx/af_ipx.c
Previous file: linux/net/ipv6/af_inet6.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.0-pre7/linux/net/ipv6/ndisc.c linux/net/ipv6/ndisc.c
@@ -144,8 +144,9 @@
 	opt[1] = space>>3;
 	memcpy(opt+2, data, data_len);
 	data_len += 2;
+	opt += data_len;
 	if ((space -= data_len) > 0)
-		memset(opt + data_len, 0, space);
+		memset(opt, 0, space);
 	return opt + space;
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov