From fae9c380ce04d3419af5587c43bd14a058c6bab0 Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Mon, 26 Feb 2018 18:14:37 +0000
Subject: [PATCH] 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.
---
 stand/libsa/net.c | 14 ++++++++++++++
 stand/libsa/net.h | 14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/stand/libsa/net.c b/stand/libsa/net.c
index 9f2eabb1da9c..e0f8e8a208e8 100644
--- a/stand/libsa/net.c
+++ b/stand/libsa/net.c
@@ -57,6 +57,20 @@ __FBSDID("$FreeBSD$");
 #include "stand.h"
 #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.
  *
diff --git a/stand/libsa/net.h b/stand/libsa/net.h
index f5a5b5959ff2..5bb1ac57f9e8 100644
--- a/stand/libsa/net.h
+++ b/stand/libsa/net.h
@@ -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 */