summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cesar/cp/beacon/src/beacon.c3
-rw-r--r--cesar/cp/cco/action/src/cco_action.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/cesar/cp/beacon/src/beacon.c b/cesar/cp/beacon/src/beacon.c
index 1d2a3cb166..d8cca0da67 100644
--- a/cesar/cp/beacon/src/beacon.c
+++ b/cesar/cp/beacon/src/beacon.c
@@ -140,7 +140,8 @@ cp_beacon_fill_share_memory (cp_t *ctx)
beacon->vf.aclsss = 0;
beacon->vf.hoip = ctx->beacon.hoip.hoip_flag;
beacon->vf.rtsbf = false;
- beacon->vf.nm = BSU_BEACON_NM_CSMA_ONLY;
+ beacon->vf.nm =
+ net == NULL ? BSU_BEACON_NM_CSMA_ONLY : cp_net_get_nm (ctx, net);
beacon->vf.ccocap = CP_CCO_LEVEL;
/* regions. */
diff --git a/cesar/cp/cco/action/src/cco_action.c b/cesar/cp/cco/action/src/cco_action.c
index 4779adb0f8..ed9c750ca8 100644
--- a/cesar/cp/cco/action/src/cco_action.c
+++ b/cesar/cp/cco/action/src/cco_action.c
@@ -854,6 +854,8 @@ cp_cco_action_start (cp_t *ctx)
cp_av_cco_region_default (ctx);
cp_cco_bw_alloc_clean (ctx, &ctx->bw.alloc_list);
cp_av_cco_bw_schedules_default (ctx);
+ /* Set network mode as CSMA only mode. */
+ cp_net_set_nm (ctx, net, BSU_BEACON_NM_CSMA_ONLY);
/* Set the CCo status in the station own data. */
own = cp_sta_mgr_get_sta_own_data (ctx);
own->nid_track = 0;