summaryrefslogtreecommitdiff
path: root/cesar/cp/src/cp.c
diff options
context:
space:
mode:
authorAleksandar Cecaric2011-10-18 10:09:43 +0200
committerAleksandar Cecaric2011-10-18 10:09:43 +0200
commit652fe7afa35ee9dcdcf59090b0d6ee7472ff39e5 (patch)
tree8210a3e9216c858681f3b5910a60c42ab2b57d43 /cesar/cp/src/cp.c
parent572d57302cb0163ffa7a185a02588a72fbc56636 (diff)
parenta6bea4a24e98365390e1a5e6b1e8ebc98b1a20f4 (diff)
Merge commit 'av-1.1.11' into eoc
Conflicts: cesar/bsu/inc/context.h cesar/bsu/ntb/ntb.h cesar/bsu/ntb/src/ntb.c cesar/bsu/ntb/test/utest/src/ntb_compute.c cesar/bsu/src/bsu.c cesar/cp/sta/mgr/test/src/sta_mgr.c cesar/hal/phy/src/phy.c cesar/mac/pbproc/src/fsm_rx_sound.c cesar/mac/pbproc/src/fsm_tx_sound.c cesar/mac/pbproc/src/prep_mpdu.c cesar/mac/pbproc/test/int/sparc-Config cesar/station/src/station.c cleopatre/devkit/plcdrv/arm/inc/linux_drv.h cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c
Diffstat (limited to 'cesar/cp/src/cp.c')
-rw-r--r--cesar/cp/src/cp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cesar/cp/src/cp.c b/cesar/cp/src/cp.c
index dd1cc868ee..3396c61d94 100644
--- a/cesar/cp/src/cp.c
+++ b/cesar/cp/src/cp.c
@@ -62,6 +62,9 @@ cp_init (bsu_t *bsu, bsu_aclf_t* aclf, mac_config_t * mac_config,
cp_global.bsu = bsu;
cp_global.bsu_aclf = aclf;
+ /* Init the random generator. */
+ lib_rnd_init (&cp_global.rnd, seed ^ 0x87543571);
+
/* Initialise traces. */
cp_trace_init (&cp_global);
@@ -98,9 +101,6 @@ cp_init (bsu_t *bsu, bsu_aclf_t* aclf, mac_config_t * mac_config,
/* Initialise the FSM. */
cp_fsm_init (&cp_global);
- /* Init the random generator. */
- lib_rnd_init (&cp_global.rnd, seed ^ 0x87543571);
-
/* Init CE in TX. */
ce_tx_init (&cp_global);
#if CONFIG_CP_EOC_SCHEDULER && CONFIG_CP_STA_MGR_EOC