pdch: rcv_data_block: Avoid releasing ULC entry if expecting something else on UL
Let's only release PDCH ULC entry if it was indeed what we expected. In other case, time it out. Change-Id: I1537587f5ee801c633784691b576ebb1ed521e95
This commit is contained in:
parent
32744c8916
commit
ffa2918bc5
|
@ -982,7 +982,9 @@ int gprs_rlcmac_pdch::rcv_data_block(uint8_t *data, uint8_t data_len, uint32_t f
|
||||||
if (node) {
|
if (node) {
|
||||||
switch (node->type) {
|
switch (node->type) {
|
||||||
case PDCH_ULC_NODE_TBF_USF:
|
case PDCH_ULC_NODE_TBF_USF:
|
||||||
if (tbf != node->tbf_usf.ul_tbf)
|
if (tbf == node->tbf_usf.ul_tbf)
|
||||||
|
pdch_ulc_release_node(ulc, node);
|
||||||
|
else
|
||||||
LOGPDCH(this, DRLCMACUL, LOGL_NOTICE, "FN=%" PRIu32 " "
|
LOGPDCH(this, DRLCMACUL, LOGL_NOTICE, "FN=%" PRIu32 " "
|
||||||
"Rx UL DATA from unexpected %s vs expected %s\n",
|
"Rx UL DATA from unexpected %s vs expected %s\n",
|
||||||
fn, tbf_name(tbf), tbf_name(node->tbf_usf.ul_tbf));
|
fn, tbf_name(tbf), tbf_name(node->tbf_usf.ul_tbf));
|
||||||
|
@ -998,7 +1000,6 @@ int gprs_rlcmac_pdch::rcv_data_block(uint8_t *data, uint8_t data_len, uint32_t f
|
||||||
fn, tbf_name(tbf));
|
fn, tbf_name(tbf));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
pdch_ulc_release_node(ulc, node);
|
|
||||||
} else {
|
} else {
|
||||||
LOGPDCH(this, DRLCMACUL, LOGL_NOTICE, "FN=%" PRIu32 " "
|
LOGPDCH(this, DRLCMACUL, LOGL_NOTICE, "FN=%" PRIu32 " "
|
||||||
"Rx UL DATA from unexpected %s\n", fn, tbf_name(tbf));
|
"Rx UL DATA from unexpected %s\n", fn, tbf_name(tbf));
|
||||||
|
|
Loading…
Reference in New Issue