Date: Mon, 26 Feb 2018 18:14:37 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330026 - head/stand/libsa Message-ID: <201802261814.w1QIEcxX094108@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Mon Feb 26 18:14:37 2018 New Revision: 330026 URL: https://svnweb.freebsd.org/changeset/base/330026 Log: libsa: Move MAXWAIT from net.h to net.c It's not a setting that has any effect or use outside of the net.c context. Modified: head/stand/libsa/net.c head/stand/libsa/net.h Modified: head/stand/libsa/net.c ============================================================================== --- head/stand/libsa/net.c Mon Feb 26 18:06:15 2018 (r330025) +++ head/stand/libsa/net.c Mon Feb 26 18:14:37 2018 (r330026) @@ -58,6 +58,20 @@ __FBSDID("$FreeBSD$"); #include "net.h" /* + * Maximum wait time for sending and receiving before we give up and timeout. + * If set to 0, operations will eventually timeout completely, but send/recv + * timeouts must progress exponentially from MINTMO to MAXTMO before final + * timeout is hit. + */ +#ifndef MAXWAIT +#define MAXWAIT 0 /* seconds */ +#endif + +#if MAXWAIT < 0 +#error MAXWAIT must not be a negative number +#endif + +/* * Send a packet and wait for a reply, with exponential backoff. * * The send routine must return the actual number of bytes written, Modified: head/stand/libsa/net.h ============================================================================== --- head/stand/libsa/net.h Mon Feb 26 18:06:15 2018 (r330025) +++ head/stand/libsa/net.h Mon Feb 26 18:14:37 2018 (r330026) @@ -61,20 +61,6 @@ enum net_proto { #define MAXTMO 120 /* seconds */ #define MINTMO 2 /* seconds */ -/* - * Maximum wait time for sending and receiving before we give up and timeout. - * If set to 0, operations will eventually timeout completely, but send/recv - * timeouts must progress exponentially from MINTMO to MAXTMO before final - * timeout is hit. - */ -#ifndef MAXWAIT -#define MAXWAIT 0 /* seconds */ -#endif - -#if MAXWAIT < 0 -#error MAXWAIT must not be a negative number -#endif - #define FNAME_SIZE 128 #define IFNAME_SIZE 16 #define RECV_SIZE 1536 /* XXX delete this */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802261814.w1QIEcxX094108>