When it's necessary to kldload tun(4), don't forget to re-try to open

tun0.

Submitted by:	qhwt@myrealbox.com

1 files changed, 10 insertions, 4 deletions

diff --git a/usr.sbin/ppp/defs.c b/usr.sbin/ppp/defs.c
index b61b7de..a4929cc 100644
--- a/usr.sbin/ppp/defs.c
+++ b/usr.sbin/ppp/defs.c
@@ -420,19 +420,25 @@ Concatinate(char *buf, size_t sz, int argc, const char *const *argv)
   }
 }
 
-void
+int
 loadmodules(int how, const char *module, ...)
 {
+  int loaded = 0;
 #if defined(__FreeBSD__) && !defined(NOKLDLOAD)
   va_list ap;
 
   va_start(ap, module);
   while (module != NULL) {
-    if (modfind(module) == -1 && ID0kldload(module) == -1 &&
-        how == LOAD_VERBOSLY)
-      log_Printf(LogWARN, "%s: Cannot load module\n", module);
+    if (modfind(module) == -1) {
+      if (ID0kldload(module) == -1) {
+        if (how == LOAD_VERBOSLY)
+          log_Printf(LogWARN, "%s: Cannot load module\n", module);
+      } else
+        loaded++;
+    }
     module = va_arg(ap, const char *);
   }
   va_end(ap);
 #endif
+  return loaded;
 }