From 1801f369f0033284b437f14539316b95645e8073 Mon Sep 17 00:00:00 2001
From: "7u83@mail.ru" <7u83@mail.ru@noemail.net>
Date: Thu, 31 Mar 2016 17:26:27 +0000
Subject: [PATCH] Various changes...

FossilOrigin-Name: c770a2ede614ca73bc7319cfa7dbe5ea9c673f833b0cf5c03451f4ceae2a0324
---
 src/mod/cisco/cisco80211.c        | 8 +++++---
 src/mod/cisco/cisco_actions_wtp.c | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/mod/cisco/cisco80211.c b/src/mod/cisco/cisco80211.c
index 7163c9c8..f106b9b7 100644
--- a/src/mod/cisco/cisco80211.c
+++ b/src/mod/cisco/cisco80211.c
@@ -61,12 +61,12 @@ exit(0);
 
 
 
-int cw_put_elem_cisco_ap_regulatory_domain(uint8_t *dst,int rid, mbag_t radio)
+int cw_put_elem_cisco_ap_regulatory_domain(uint8_t *dst,int rid, mbag_t radio, int band)
 {
 	//int l=0;
 	uint8_t *d=dst+10;
 	
-	d+=cw_put_byte(d,rid);		/* Band ID */
+	d+=cw_put_byte(d,band);		/* Band ID */
 	d+=cw_put_byte(d,1);		/* Set True/False */
 	d+=cw_put_byte(d,rid);		/* Slot ID */
 	d+=cw_put_word(d,mbag_get_word(radio,CW_RADIO_REG_DOMAIN,1));
@@ -96,7 +96,9 @@ int cisco_out_80211_wtp_radio_cfg(struct conn *conn, struct cw_action_out *a, ui
 		}
 //		l+=cw_put_elem_radio_info(dst+l,i->id,i->data);
 		l+=cw_put_elem_cisco_radio_cfg(dst+l,i->iid,i->data);
-		l+=cw_put_elem_cisco_ap_regulatory_domain(dst+l,i->iid,i->data);
+		l+=cw_put_elem_cisco_ap_regulatory_domain(dst+l,i->iid,i->data,0);
+//		l+=cw_put_elem_cisco_ap_regulatory_domain(dst+l,i->iid,i->data,1);
+//		l+=cw_put_elem_cisco_ap_regulatory_domain(dst+l,i->iid,i->data,2);
 
 	}
 	return l;
diff --git a/src/mod/cisco/cisco_actions_wtp.c b/src/mod/cisco/cisco_actions_wtp.c
index b5867dbc..d20aea72 100644
--- a/src/mod/cisco/cisco_actions_wtp.c
+++ b/src/mod/cisco/cisco_actions_wtp.c
@@ -25,6 +25,7 @@
 #include "cw/radio.h"
 #include "cw/capwap_cisco.h"
 #include "cw/capwap80211.h"
+#include "cw/capwap80211_items.h"
 
 #include "mod_cisco.h"
 
@@ -237,7 +238,7 @@ static cw_action_out_t actions_out[]={
 		.vendor_id = CW_VENDOR_ID_CISCO,
 		.msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST,
 		.elem_id = CW_ELEM80211_WTP_RADIO_INFORMATION,
-		.item_id = CW_ITEM_RADIO_CFG,
+		.item_id = CW_ITEM80211_WTP_RADIO_INFORMATION,
 		.out = cisco_out_80211_wtp_radio_cfg,
 		.get = cw_out_get_config,
 		.mand = 1