diff --git a/src/capwap/cwsend_conf_status_response.c b/src/capwap/cwsend_conf_status_response.c
index 43402368..36027982 100644
--- a/src/capwap/cwsend_conf_status_response.c
+++ b/src/capwap/cwsend_conf_status_response.c
@@ -13,8 +13,8 @@ void cwmsg_addelem_capwap_timers(struct cwmsg *msg,int discovery,int echo_reques
 
 void cwsend_conf_status_response(struct conn * conn,int seqnum, int rc, struct radioinfo * radioinfo, struct ac_info * acinfo, struct wtpinfo * wtpinfo)
 {
-	struct cwmsg * cwmsg = &conn->swm;	
-	cwmsg_init(cwmsg,conn->buffer,CWMSG_CONFIGURATION_STATUS_RESPONSE,seqnum,NULL);
+	struct cwmsg * cwmsg = &conn->resp_msg;	
+	cwmsg_init(cwmsg,conn->resp_buffer,CWMSG_CONFIGURATION_STATUS_RESPONSE,seqnum,NULL);
 
 	cwmsg_addelem_capwap_timers(cwmsg,120,15);
 /*
diff --git a/src/capwap/cwsend_discovery_response.c b/src/capwap/cwsend_discovery_response.c
index 99df8b10..9d80e247 100644
--- a/src/capwap/cwsend_discovery_response.c
+++ b/src/capwap/cwsend_discovery_response.c
@@ -33,8 +33,8 @@ void cwsend_discovery_response(struct conn * conn,int seqnum, struct radioinfo *
 {
 	cw_dbg(DBG_CW_MSG,"Sending discovery response to %s, seq = %d",sock_addr2str(&conn->addr),seqnum);
 
-	struct cwmsg * cwmsg = &conn->swm;	
-	cwmsg_init(cwmsg,conn->buffer,CWMSG_DISCOVERY_RESPONSE,seqnum,radioinfo);
+	struct cwmsg * cwmsg = &conn->resp_msg;	
+	cwmsg_init(cwmsg,conn->resp_buffer,CWMSG_DISCOVERY_RESPONSE,seqnum,NULL);
 
 //	cwmsg_addelem_ac_timestamp(cwmsg);
 	
@@ -47,6 +47,10 @@ void cwsend_discovery_response(struct conn * conn,int seqnum, struct radioinfo *
 
 
 	cwmsg_addelem_vendor_cisco_ap_timesync(cwmsg);
+
+
+//	uint8_t buffer[]="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+//	cwmsg_addelem_vendor_specific_payload(cwmsg,CW_VENDOR_ID_CISCO, 149, buffer,sizeof(buffer));
 	
 	conn_send_response(conn,cwmsg,seqnum);
 }