diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2012-07-15 16:27:01 +0200 |
|---|---|---|
| committer | Andreas Eversberg <jolly@eversberg.eu> | 2012-07-15 16:27:01 +0200 |
| commit | ee31b78cfd0945e92a8e11e1460e57886cd5b854 (patch) | |
| tree | bf70afc74f6b2d54d95b87fb4038968452f8c94c /src/gprs_rlcmac_data.cpp | |
| parent | 06f96cd5a72e475db44bda14a9bf86bed4260857 (diff) | |
Fixed contention resolution issue
In order to do downlink assignment during uplink TBF, the content
resolution must be completed. It is completed when the first Packet
Uplink Ack/Nack message is transmitted to the mobile.
Diffstat (limited to 'src/gprs_rlcmac_data.cpp')
| -rw-r--r-- | src/gprs_rlcmac_data.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/gprs_rlcmac_data.cpp b/src/gprs_rlcmac_data.cpp index 9b3a0953..76cc0332 100644 --- a/src/gprs_rlcmac_data.cpp +++ b/src/gprs_rlcmac_data.cpp @@ -218,7 +218,7 @@ uplink_request: break; } ul_tbf->tlli = tbf->tlli; - ul_tbf->tlli_valid = 1; /* no content resolution */ + ul_tbf->tlli_valid = 1; /* no contention resolution */ ul_tbf->ta = tbf->ta; /* use current TA */ tbf_new_state(ul_tbf, GPRS_RLCMAC_FLOW); tbf_timer_start(ul_tbf, 3169, bts->t3169, 0); @@ -550,6 +550,10 @@ struct msgb *gprs_rlcmac_send_uplink_ack(struct gprs_rlcmac_tbf *tbf, bitvec_free(ack_vec); free(mac_control_block); + /* now we must set this flag, so we are allowed to assign downlink + * TBF on PACCH. it is only allowed when TLLI is aknowledged. */ + tbf->contention_resolution_done = 1; + if (final) { tbf->poll_state = GPRS_RLCMAC_POLL_SCHED; tbf->poll_fn = (fn + 13) % 2715648; @@ -1143,6 +1147,8 @@ tx_block: "sheduled in this TS %d, waiting for " "TS %d\n", ts, tbf->control_ts); else { + LOGP(DRLCMAC, LOGL_DEBUG, "Polling sheduled in this " + "TS %d\n", ts); /* start timer whenever we send the final block */ if (rh->fbi == 1) tbf_timer_start(tbf, 3191, bts->t3191, 0); @@ -1308,9 +1314,17 @@ struct msgb *gprs_rlcmac_send_packet_downlink_assignment( #endif /* on uplink TBF we get the downlink TBF to be assigned. */ - if (tbf->direction == GPRS_RLCMAC_UL_TBF) + if (tbf->direction == GPRS_RLCMAC_UL_TBF) { + /* be sure to check first, if contention resolution is done, + * otherwise we cannot send the assignment yet */ + if (!tbf->contention_resolution_done) { + LOGP(DRLCMAC, LOGL_NOTICE, "Cannot assign DL TBF now, " + "because contention resolution is not " + "finished.\n"); + return NULL; + } new_tbf = tbf_by_tlli(tbf->tlli, GPRS_RLCMAC_DL_TBF); - else + } else new_tbf = tbf; if (!new_tbf) { LOGP(DRLCMACDL, LOGL_ERROR, "We have a schedule for downlink " |