summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/cp
diff options
context:
space:
mode:
authorCeline Buret2011-12-15 18:35:11 +0100
committerCeline Buret2011-12-15 18:35:11 +0100
commit519c75178b12d197dd848888bfb8353eabab828e (patch)
tree0db3f199c19401b2f98749cd633338eacc873355 /cesar/ce/rx/cp
parentb9101ecaad064aa1f61a493ee9adf6bf700937d3 (diff)
parent6712920eae1acc12f10ee0dc5b6478da859cbead (diff)
Merge commit 'av-1.2.0' into eoc
Conflicts: cesar/cp/mme.h cesar/cp/msg/src/msg.c cesar/cp/msg/test/Makefile cesar/cp/msg/test/src/cc_discover_list.c cesar/mac/sar/Config cesar/mac/sar/src/sar.c cesar/mac/sar/stub/src/sar.c cleopatre/application/managerd/src/managerd.c cleopatre/application/managerd/src/mme_nl.c cleopatre/buildroot/.gitignore cleopatre/devkit/doc/cleopatre_mme_specs.odt cleopatre/devkit/plcdrv/arm/src/linux_drv.c cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c
Diffstat (limited to 'cesar/ce/rx/cp')
-rw-r--r--cesar/ce/rx/cp/src/mme.c4
-rw-r--r--cesar/ce/rx/cp/test/src/stub.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/cesar/ce/rx/cp/src/mme.c b/cesar/ce/rx/cp/src/mme.c
index 6395eef34b..82605b2f74 100644
--- a/cesar/ce/rx/cp/src/mme.c
+++ b/cesar/ce/rx/cp/src/mme.c
@@ -205,7 +205,7 @@ ce_rx_mme_send_cm_chan_est_ind (cp_t *ctx, cp_sta_t *sta, tonemaps_t *tms,
cp_sta_get_peer (sta, &peer);
/* Build MME. */
- cp_mme_tx_t *mme = cp_msg_mme_init (ctx, &peer, CM_CHAN_EST_IND);
+ cp_mme_tx_t *mme = cp_msg_mme_init_not_frag (ctx, &peer, CM_CHAN_EST_IND);
dbg_assert (mme);
bitstream_write (&mme->bitstream, tms->max_fl_av, 16);
@@ -380,7 +380,7 @@ ce_rx_mme_send_cm_tm_update_ind (cp_t *ctx, cp_sta_t *sta, tonemaps_t *tms,
cp_sta_get_peer (sta, &peer);
/* Build MME. */
- cp_mme_tx_t *mme = cp_msg_mme_init (ctx, &peer, CM_TM_UPDATE_IND);
+ cp_mme_tx_t *mme = cp_msg_mme_init_not_frag (ctx, &peer, CM_TM_UPDATE_IND);
dbg_assert (mme);
bitstream_write (&mme->bitstream, default_tmi, 8);
diff --git a/cesar/ce/rx/cp/test/src/stub.c b/cesar/ce/rx/cp/test/src/stub.c
index af2e73a758..1f9c73b87c 100644
--- a/cesar/ce/rx/cp/test/src/stub.c
+++ b/cesar/ce/rx/cp/test/src/stub.c
@@ -27,7 +27,7 @@ cp_sta_get_peer (cp_sta_t *ctx, cp_mme_peer_t *peer)
}
cp_mme_tx_t *
-cp_msg_mme_init (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype)
+cp_msg_mme_init_not_frag (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype)
{
static u8 buffer[ETH_PACKET_MAX_SIZE];
static cp_mme_tx_t mme;