diff --git a/src/mod/cisco/cisco.h b/src/mod/cisco/cisco.h
index 570710b0..988ebfb3 100644
--- a/src/mod/cisco/cisco.h
+++ b/src/mod/cisco/cisco.h
@@ -5,8 +5,9 @@
 #include "capwap/action.h"
 
 extern int cisco_out_ap_timesync(struct conn *conn,struct cw_action_out * a,uint8_t *dst);
-int cisco_in_wtp_descriptor(struct conn *conn, struct cw_action_in *a, uint8_t * data,
+extern int cisco_in_wtp_descriptor(struct conn *conn, struct cw_action_in *a, uint8_t * data,
 			 int len, struct sockaddr *from);
+extern int cisco_out_ac_descriptor(struct conn *conn,struct cw_action_out * a,uint8_t *dst) ;
 
 
 #endif
diff --git a/src/mod/cisco/cisco_actions_ac.c b/src/mod/cisco/cisco_actions_ac.c
index a610b1e8..ab816713 100644
--- a/src/mod/cisco/cisco_actions_ac.c
+++ b/src/mod/cisco/cisco_actions_ac.c
@@ -90,7 +90,7 @@ static cw_action_out_t actions_out[]={
 		.msg_id = CW_MSG_DISCOVERY_RESPONSE, 
 		.item_id = CW_ITEM_AC_DESCRIPTOR,
 		.elem_id = CW_ELEM_AC_DESCRIPTOR, 
-		.out = cw_out_cisco_ac_descriptor,
+		.out = cisco_out_ac_descriptor,
 		.mand = 1
 	}
 
diff --git a/src/wtp/Makefile b/src/wtp/Makefile
index 0548825b..30fdfcaf 100644
--- a/src/wtp/Makefile
+++ b/src/wtp/Makefile
@@ -22,10 +22,10 @@ endif
 
 CFLAGS += -O0 -Wall -Wno-unused-variable -Werror -g
 #CFLAGS += -Os -Wall 
-LDFLAGS += -L../contrib/jsmn -L../../src/capwap/$(ARCH) 
+LDFLAGS += -L../contrib/jsmn -L../../src/lib/$(ARCH) 
 
 
-LIBS+=-lcapwap
+LIBS+=-lcw
 LIBS+=-lnl-3
 LIBS+=-lnl-genl-3
 LIBS+=-ljsmn
diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c
index 3267cb4a..db3da91b 100644
--- a/src/wtp/wtp_main.c
+++ b/src/wtp/wtp_main.c
@@ -132,7 +132,7 @@ mavl_destroy(b);
 	conn->base_rmac=get_base_rmac();
 
 conn->capwap_mode = CW_MODE_CAPWAP;
-//conn->capwap_mode = CW_MODE_CISCO;
+conn->capwap_mode = CW_MODE_CISCO;
 
 the_conn->strict_capwap=0;
 
@@ -169,8 +169,8 @@ conn->config=mbag_create();
 
 
 
-cw_set_msg_end_callback(conn,CW_STATE_RUN,CW_MSG_CONFIGURATION_UPDATE_REQUEST,handle_update_req);
-cw_set_msg_end_callback(conn,CW_STATE_CONFIGURE,CW_MSG_CONFIGURATION_STATUS_RESPONSE,handle_update_req);
+//cw_set_msg_end_callback(conn,CW_STATE_RUN,CW_MSG_CONFIGURATION_UPDATE_REQUEST,handle_update_req);
+//cw_set_msg_end_callback(conn,CW_STATE_CONFIGURE,CW_MSG_CONFIGURATION_STATUS_RESPONSE,handle_update_req);