svn commit: r347642 - head/contrib/wpa/wpa_supplicant

[Cy Schubert]

Author: cy
Date: Thu May 16 02:41:25 2019
New Revision: 347642
URL: https://svnweb.freebsd.org/changeset/base/347642

Log:
  The driver list prints "(null)" for the NDIS driver when -h (help) or
  an unknown switch is passed outputting the command usage. This is
  because the NDIS driver is uninitialized when usage help is printed.
  To resolve this we initialize the driver prior to the possibility of
  printing the usage help message.
  
  Obtained from:	The wpa_supplicant port
  MFC after:	1 week

Modified:
  head/contrib/wpa/wpa_supplicant/main.c
  head/contrib/wpa/wpa_supplicant/wpa_supplicant.c

Modified: head/contrib/wpa/wpa_supplicant/main.c
==============================================================================
--- head/contrib/wpa/wpa_supplicant/main.c	Thu May 16 02:18:57 2019	(r347641)
+++ head/contrib/wpa/wpa_supplicant/main.c	Thu May 16 02:41:25 2019	(r347642)
@@ -199,6 +199,11 @@ int main(int argc, char *argv[])
 
 	wpa_supplicant_fd_workaround(1);
 
+#ifdef CONFIG_DRIVER_NDIS
+	void driver_ndis_init_ops(void);
+	driver_ndis_init_ops();
+#endif /* CONFIG_DRIVER_NDIS */
+
 	for (;;) {
 		c = getopt(argc, argv,
 			   "b:Bc:C:D:de:f:g:G:hi:I:KLMm:No:O:p:P:qsTtuvW");

Modified: head/contrib/wpa/wpa_supplicant/wpa_supplicant.c
==============================================================================
--- head/contrib/wpa/wpa_supplicant/wpa_supplicant.c	Thu May 16 02:18:57 2019	(r347641)
+++ head/contrib/wpa/wpa_supplicant/wpa_supplicant.c	Thu May 16 02:41:25 2019	(r347642)
@@ -6357,13 +6357,6 @@ struct wpa_global * wpa_supplicant_init(struct wpa_par
 	if (params == NULL)
 		return NULL;
 
-#ifdef CONFIG_DRIVER_NDIS
-	{
-		void driver_ndis_init_ops(void);
-		driver_ndis_init_ops();
-	}
-#endif /* CONFIG_DRIVER_NDIS */
-
 #ifndef CONFIG_NO_WPA_MSG
 	wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
 #endif /* CONFIG_NO_WPA_MSG */