Move ctrl_iface_ap.c into src/ap

diff --git a/hostapd/Makefile b/hostapd/Makefile
index 900bd26f619cd28e6fd1b5e81890417557f69896..5b34ba839f84d058c93a531b9ef7efc739c5caaa 100644 (file)
--- a/hostapd/Makefile
+++ b/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

diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index 479724c2122806f4dce6235b9b9cad628f9b9c42..ccb2266f3053ea0378eacb917be56ec82cfa858d 100644 (file)
--- a/hostapd/ctrl_iface.c
+++ b/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 {

diff --git a/hostapd/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c
similarity index 100%
rename from hostapd/ctrl_iface_ap.c
rename to src/ap/ctrl_iface_ap.c

diff --git a/hostapd/ctrl_iface_ap.h b/src/ap/ctrl_iface_ap.h
similarity index 100%
rename from hostapd/ctrl_iface_ap.h
rename to src/ap/ctrl_iface_ap.h

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 3616b148df2d6d1a823445b9060500e183baeec4..2e65ab122031bf21912684694fcd0bab5f2b922c 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/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

diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index ce9c54cd861f5374623cc53aec38fb2aea76711c..2fc875cd5b12236cc3dc03f9ed4a9032ea1394cb 100644 (file)
--- a/wpa_supplicant/ap.c
+++ b/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"