Update workaround for limitations in the arp code.
Adjust the RPC timeout message which occured when the old workaround broke to show the correct IP address.
This commit is contained in:
parent
c555a715f5
commit
8bd965cce4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=34572
@ -1,4 +1,4 @@
|
||||
/* $Id: bootp_subr.c,v 1.8 1998/01/18 18:46:20 tegge Exp $ */
|
||||
/* $Id: bootp_subr.c,v 1.9 1998/02/09 06:10:32 eivind Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Gordon Ross, Adam Glass
|
||||
@ -766,10 +766,10 @@ bootpc_init(void)
|
||||
return;
|
||||
|
||||
/*
|
||||
* Bump time if 0.
|
||||
* Wait until arp entries can be handled.
|
||||
*/
|
||||
if (!time.tv_sec)
|
||||
time.tv_sec++;
|
||||
while (time.tv_sec == 0)
|
||||
tsleep(&time, PZERO+8, "arpkludge", 10);
|
||||
|
||||
/*
|
||||
* Find a network interface.
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* $NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $ */
|
||||
/* $Id: krpc_subr.c,v 1.6 1997/10/12 20:25:36 phk Exp $ */
|
||||
/* $Id: krpc_subr.c,v 1.7 1997/10/28 15:59:03 bde Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Gordon Ross, Adam Glass
|
||||
@ -337,7 +337,7 @@ krpc_call(sa, prog, vers, func, data, from_p, procp)
|
||||
timo++;
|
||||
else
|
||||
printf("RPC timeout for server 0x%x\n",
|
||||
ntohl(sin->sin_addr.s_addr));
|
||||
ntohl(sa->sin_addr.s_addr));
|
||||
|
||||
/*
|
||||
* Wait for up to timo seconds for a reply.
|
||||
|
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95
|
||||
* $Id: nfs_vfsops.c,v 1.54 1998/02/09 06:10:39 eivind Exp $
|
||||
* $Id: nfs_vfsops.c,v 1.55 1998/03/01 22:46:30 msmith Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -399,8 +399,8 @@ nfs_mountroot(mp)
|
||||
* XXX time must be non-zero when we init the interface or else
|
||||
* the arp code will wedge...
|
||||
*/
|
||||
if (time.tv_sec == 0)
|
||||
time.tv_sec = 1;
|
||||
while (time.tv_sec == 0)
|
||||
tsleep(&time, PZERO+8, "arpkludge", 10);
|
||||
|
||||
if (nfs_diskless_valid==1)
|
||||
nfs_convert_diskless();
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $Id: bootp_subr.c,v 1.8 1998/01/18 18:46:20 tegge Exp $ */
|
||||
/* $Id: bootp_subr.c,v 1.9 1998/02/09 06:10:32 eivind Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Gordon Ross, Adam Glass
|
||||
@ -766,10 +766,10 @@ bootpc_init(void)
|
||||
return;
|
||||
|
||||
/*
|
||||
* Bump time if 0.
|
||||
* Wait until arp entries can be handled.
|
||||
*/
|
||||
if (!time.tv_sec)
|
||||
time.tv_sec++;
|
||||
while (time.tv_sec == 0)
|
||||
tsleep(&time, PZERO+8, "arpkludge", 10);
|
||||
|
||||
/*
|
||||
* Find a network interface.
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* $NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $ */
|
||||
/* $Id: krpc_subr.c,v 1.6 1997/10/12 20:25:36 phk Exp $ */
|
||||
/* $Id: krpc_subr.c,v 1.7 1997/10/28 15:59:03 bde Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Gordon Ross, Adam Glass
|
||||
@ -337,7 +337,7 @@ krpc_call(sa, prog, vers, func, data, from_p, procp)
|
||||
timo++;
|
||||
else
|
||||
printf("RPC timeout for server 0x%x\n",
|
||||
ntohl(sin->sin_addr.s_addr));
|
||||
ntohl(sa->sin_addr.s_addr));
|
||||
|
||||
/*
|
||||
* Wait for up to timo seconds for a reply.
|
||||
|
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95
|
||||
* $Id: nfs_vfsops.c,v 1.54 1998/02/09 06:10:39 eivind Exp $
|
||||
* $Id: nfs_vfsops.c,v 1.55 1998/03/01 22:46:30 msmith Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -399,8 +399,8 @@ nfs_mountroot(mp)
|
||||
* XXX time must be non-zero when we init the interface or else
|
||||
* the arp code will wedge...
|
||||
*/
|
||||
if (time.tv_sec == 0)
|
||||
time.tv_sec = 1;
|
||||
while (time.tv_sec == 0)
|
||||
tsleep(&time, PZERO+8, "arpkludge", 10);
|
||||
|
||||
if (nfs_diskless_valid==1)
|
||||
nfs_convert_diskless();
|
||||
|
Loading…
Reference in New Issue
Block a user