svn commit: r317758 - head/sbin/ifconfig

[Alan Somers]

Author: asomers
Date: Wed May  3 19:53:01 2017
New Revision: 317758
URL: https://svnweb.freebsd.org/changeset/base/317758

Log:
  Unbreak ifconfig for mlx4en(4) after r317755
  
  ifconfig doesn't correctly infer mlx interfaces' module names, so it will
  attempt to load the mlx(4) module even when not necessary.
  
  Reported by:	rstone
  MFC after:	3 weeks
  X-MFC-With:	317755
  Sponsored by:	Spectra Logic Corp

Modified:
  head/sbin/ifconfig/ifconfig.c

Modified: head/sbin/ifconfig/ifconfig.c
==============================================================================
--- head/sbin/ifconfig/ifconfig.c	Wed May  3 18:46:33 2017	(r317757)
+++ head/sbin/ifconfig/ifconfig.c	Wed May  3 19:53:01 2017	(r317758)
@@ -1374,9 +1374,11 @@ ifmaybeload(const char *name)
 		}
 	}
 
-	/* not present, we should try to load it */
-	if (kldload(ifkind) < 0)
-		err(1, "kldload(%s)", ifkind);
+	/*
+	 * Try to load the module.  But ignore failures, because ifconfig can't
+	 * infer the names of all drivers (eg mlx4en(4)).
+	 */
+	(void) kldload(ifkind);
 }
 
 static struct cmd basic_cmds[] = {