Author: kevans
Date: Fri Apr 6 19:24:04 2018
New Revision: 332140
URL: https://svnweb.freebsd.org/changeset/base/332140
Log:
MFC r330026: 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:
stable/11/stand/libsa/net.c
stable/11/stand/libsa/net.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/stand/libsa/net.c
==============================================================================
--- stable/11/stand/libsa/net.c Fri Apr 6 19:22:22 2018 (r332139)
+++ stable/11/stand/libsa/net.c Fri Apr 6 19:24:04 2018 (r332140)
@@ -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: stable/11/stand/libsa/net.h
==============================================================================
--- stable/11/stand/libsa/net.h Fri Apr 6 19:22:22 2018 (r332139)
+++ stable/11/stand/libsa/net.h Fri Apr 6 19:24:04 2018 (r332140)
@@ -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 */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
