Module Name: src
Committed By: rtr
Date: Sat May 9 18:12:19 UTC 2015
Modified Files:
src/sys/nfs: krpc_subr.c nfs_bootdhcp.c
Log Message:
when calling nfs_boot_sendrecv pass NULL for pointers instead of 0
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/nfs/krpc_subr.c
cvs rdiff -u -r1.53 -r1.54 src/sys/nfs/nfs_bootdhcp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/nfs/krpc_subr.c
diff -u src/sys/nfs/krpc_subr.c:1.39 src/sys/nfs/krpc_subr.c:1.40
--- src/sys/nfs/krpc_subr.c:1.39 Fri Mar 27 07:18:11 2015
+++ src/sys/nfs/krpc_subr.c Sat May 9 18:12:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: krpc_subr.c,v 1.39 2015/03/27 07:18:11 hikaru Exp $ */
+/* $NetBSD: krpc_subr.c,v 1.40 2015/05/09 18:12:19 rtr Exp $ */
/*
* Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: krpc_subr.c,v 1.39 2015/03/27 07:18:11 hikaru Exp $");
+__KERNEL_RCSID(0, "$NetBSD: krpc_subr.c,v 1.40 2015/05/09 18:12:19 rtr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -314,7 +314,7 @@ krpc_call(struct sockaddr_in *sa, u_int
mhead->m_pkthdr.len = len;
mhead->m_pkthdr.rcvif = NULL;
- error = nfs_boot_sendrecv(so, nam, 0, mhead, krpccheck, &m, &from,
+ error = nfs_boot_sendrecv(so, nam, NULL, mhead, krpccheck, &m, &from,
&xid, l);
if (error)
goto out;
Index: src/sys/nfs/nfs_bootdhcp.c
diff -u src/sys/nfs/nfs_bootdhcp.c:1.53 src/sys/nfs/nfs_bootdhcp.c:1.54
--- src/sys/nfs/nfs_bootdhcp.c:1.53 Fri Mar 27 07:18:11 2015
+++ src/sys/nfs/nfs_bootdhcp.c Sat May 9 18:12:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_bootdhcp.c,v 1.53 2015/03/27 07:18:11 hikaru Exp $ */
+/* $NetBSD: nfs_bootdhcp.c,v 1.54 2015/05/09 18:12:19 rtr Exp $ */
/*-
* Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_bootdhcp.c,v 1.53 2015/03/27 07:18:11 hikaru Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_bootdhcp.c,v 1.54 2015/05/09 18:12:19 rtr Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs_boot.h"
@@ -636,7 +636,7 @@ bootpc_call(struct nfs_diskless *nd, str
#endif
error = nfs_boot_sendrecv(so, nam, bootpset, m,
- bootpcheck, 0, 0, &bpc, lwp);
+ bootpcheck, NULL, NULL, &bpc, lwp);
if (error)
goto out;
@@ -663,7 +663,7 @@ bootpc_call(struct nfs_diskless *nd, str
bpc.expected_dhcpmsgtype = DHCPACK;
error = nfs_boot_sendrecv(so, nam, bootpset, m,
- bootpcheck, 0, 0, &bpc, lwp);
+ bootpcheck, NULL, NULL, &bpc, lwp);
if (error)
goto out;
}
