Move ctrl_iface_ap.c into src/ap

hostapd/Makefile

@@ -116,7 +116,7 @@ ifdef CONFIG_NO_CTRL_IFACE
 CFLAGS += -DCONFIG_NO_CTRL_IFACE
 else
 OBJS += ctrl_iface.o
-OBJS += ctrl_iface_ap.o
+OBJS += ../src/ap/ctrl_iface_ap.o
 endif
 
 OBJS += ../src/crypto/md5.o

hostapd/ctrl_iface.c

@@ -32,8 +32,8 @@
 #include "ap/sta_info.h"
 #include "ap/accounting.h"
 #include "ap/wps_hostapd.h"
+#include "ap/ctrl_iface_ap.h"
 #include "ctrl_iface.h"
-#include "ctrl_iface_ap.h"
 
 
 struct wpa_ctrl_dst {

wpa_supplicant/Makefile

@@ -600,7 +600,7 @@ OBJS += ../src/ap/ieee802_11_auth.o
 OBJS += ../hostapd/drv_callbacks.o
 OBJS += ../hostapd/ap_drv_ops.o
 ifdef CONFIG_CTRL_IFACE
-OBJS += ../hostapd/ctrl_iface_ap.o
+OBJS += ../src/ap/ctrl_iface_ap.o
 endif
 
 CFLAGS += -DEAP_SERVER -DEAP_SERVER_IDENTITY

wpa_supplicant/ap.c

@@ -22,7 +22,7 @@
 #include "ap/ieee802_11.h"
 #endif /* NEED_AP_MLME */
 #include "ap/wps_hostapd.h"
-#include "../hostapd/ctrl_iface_ap.h"
+#include "ap/ctrl_iface_ap.h"
 #include "eap_common/eap_defs.h"
 #include "eap_server/eap_methods.h"
 #include "eap_common/eap_wsc_common.h"