svn commit: r501765 - head/security/wpa_supplicant/files

[Cy Schubert]

Author: cy
Date: Thu May 16 02:54:56 2019
New Revision: 501765
URL: https://svnweb.freebsd.org/changeset/ports/501765

Log:
  Completely remove a "nullfied" ifdef rather than making the code
  unreachable. Though this is only a cosmetic change it syncs the port
  with base commit r347642, making it easier to compare the two when
  diagnosing problems in one or the other.
  
  This was discovered tonight while reviewing some code following my
  discussion regarding an issue lwhsu@ was having earlier today.

Modified:
  head/security/wpa_supplicant/files/patch-wpa__supplicant_wpa__supplicant.c   (contents, props changed)

Modified: head/security/wpa_supplicant/files/patch-wpa__supplicant_wpa__supplicant.c
==============================================================================
--- head/security/wpa_supplicant/files/patch-wpa__supplicant_wpa__supplicant.c	Thu May 16 02:41:29 2019	(r501764)
+++ head/security/wpa_supplicant/files/patch-wpa__supplicant_wpa__supplicant.c	Thu May 16 02:54:56 2019	(r501765)
@@ -1,11 +1,16 @@
---- wpa_supplicant/wpa_supplicant.c.orig	2015-03-15 17:30:39 UTC
-+++ wpa_supplicant/wpa_supplicant.c
-@@ -4506,7 +4506,7 @@ struct wpa_global * wpa_supplicant_init(
+--- wpa_supplicant/wpa_supplicant.c.orig	2019-04-21 03:10:22.000000000 -0400
++++ wpa_supplicant/wpa_supplicant.c	2019-05-15 22:44:44.919859000 -0400
+@@ -6357,13 +6357,6 @@
  	if (params == NULL)
  		return NULL;
  
 -#ifdef CONFIG_DRIVER_NDIS
-+#ifdef XXXCONFIG_DRIVER_NDIS
- 	{
- 		void driver_ndis_init_ops(void);
- 		driver_ndis_init_ops();
+-	{
+-		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 */