<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/22511">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rename lchan->rqd_ta to last_ta<br><br>Originally, the lchan stored only the Timing Advance from the initial<br>channel request, hence it was called rqd_ta.<br><br>Since quite a while now, rqd_ta also stores the most recent Timing<br>Advance from each received Measurement Report. So rename to last_ta.<br><br>This is cosmetic preparation for an upcoming patch that clarifies<br>whether the Timing Advance is already known for Channel Activation.<br><br>Change-Id: I1049526a173819baeb4978db5bf018ba3f1006a0<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/handover_decision_2.c<br>M src/osmo-bsc/lchan_fsm.c<br>M src/osmo-bsc/lcs_loc_req.c<br>M src/osmo-bsc/lcs_ta_req.c<br>6 files changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/22511/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 8b53902..98822fb 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -657,7 +657,7 @@</span><br><span> } ass_compl;</span><br><span> } abis_ip;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t rqd_ta;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t last_ta;</span><br><span> </span><br><span> /* table of neighbor cell measurements */</span><br><span> struct neigh_meas_proc neigh_meas[MAX_NEIGH_MEAS];</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 388e2fc..5bd53f1 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -541,7 +541,7 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ta = lchan->rqd_ta;</span><br><span style="color: hsl(120, 100%, 40%);">+ ta = lchan->last_ta;</span><br><span> </span><br><span> /* BS11 requires TA shifted by 2 bits */</span><br><span> if (bts->type == GSM_BTS_TYPE_BS11)</span><br><span>@@ -1135,8 +1135,8 @@</span><br><span> if (msg->lchan->ts->trx->bts->type == GSM_BTS_TYPE_BS11</span><br><span> || msg->lchan->ts->trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE)</span><br><span> mr->ms_l1.ta >>= 2;</span><br><span style="color: hsl(0, 100%, 40%);">- /* store TA for next assignment/handover */</span><br><span style="color: hsl(0, 100%, 40%);">- mr->lchan->rqd_ta = mr->ms_l1.ta;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* store TA for handover decision, and for intra-cell re-assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ mr->lchan->last_ta = mr->ms_l1.ta;</span><br><span> }</span><br><span> if (TLVP_PRESENT(&tp, RSL_IE_L3_INFO)) {</span><br><span> msg->l3h = (uint8_t *) TLVP_VAL(&tp, RSL_IE_L3_INFO);</span><br><span>@@ -1744,7 +1744,7 @@</span><br><span> OSMO_ASSERT(lchan->rqd_ref);</span><br><span> </span><br><span> *(lchan->rqd_ref) = rqd->ref;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rqd_ta = rqd->ta;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->last_ta = rqd->ta;</span><br><span> </span><br><span> LOG_LCHAN(lchan, LOGL_DEBUG, "MS: Channel Request: reason=%s ra=0x%02x ta=%d\n",</span><br><span> gsm_chreq_name(rqd->reason), rqd->ref.ra, rqd->ta);</span><br><span>@@ -1776,7 +1776,7 @@</span><br><span> </span><br><span> /* use request reference extracted from CHAN_RQD */</span><br><span> memcpy(&ia->req_ref, lchan->rqd_ref, sizeof(ia->req_ref));</span><br><span style="color: hsl(0, 100%, 40%);">- ia->timing_advance = lchan->rqd_ta;</span><br><span style="color: hsl(120, 100%, 40%);">+ ia->timing_advance = lchan->last_ta;</span><br><span> if (!lchan->ts->hopping.enabled) {</span><br><span> ia->mob_alloc_len = 0;</span><br><span> } else {</span><br><span>diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c</span><br><span>index 0bfae9b..d5f0e14 100644</span><br><span>--- a/src/osmo-bsc/handover_decision_2.c</span><br><span>+++ b/src/osmo-bsc/handover_decision_2.c</span><br><span>@@ -1521,10 +1521,10 @@</span><br><span> </span><br><span> /* Max Distance */</span><br><span> if (lchan->meas_rep_count > 0</span><br><span style="color: hsl(0, 100%, 40%);">- && lchan->rqd_ta > ho_get_hodec2_max_distance(bts->ho)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ && lchan->last_ta > ho_get_hodec2_max_distance(bts->ho)) {</span><br><span> global_ho_reason = HO_REASON_MAX_DISTANCE;</span><br><span> LOGPHOLCHAN(lchan, LOGL_NOTICE, "TA is TOO HIGH: %u > %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rqd_ta, ho_get_hodec2_max_distance(bts->ho));</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->last_ta, ho_get_hodec2_max_distance(bts->ho));</span><br><span> /* start penalty timer to prevent coming back too</span><br><span> * early. it must be started before selecting a better cell,</span><br><span> * so there is no assignment selected, due to running</span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 5054096..80ac1a1 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -580,7 +580,7 @@</span><br><span> ms_power_dbm = ms_pwr_dbm(bts->band, old_lchan->ms_power);</span><br><span> lchan_update_ms_power_ctrl_level(lchan, ms_power_dbm >= 0 ? ms_power_dbm : bts->ms_max_power);</span><br><span> lchan->bs_power = old_lchan->bs_power;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rqd_ta = old_lchan->rqd_ta;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->last_ta = old_lchan->last_ta;</span><br><span> } else {</span><br><span> lchan_update_ms_power_ctrl_level(lchan, bts->ms_max_power);</span><br><span> /* Upon last entering the UNUSED state, from lchan_reset():</span><br><span>diff --git a/src/osmo-bsc/lcs_loc_req.c b/src/osmo-bsc/lcs_loc_req.c</span><br><span>index ca5c7b9..39bc341 100644</span><br><span>--- a/src/osmo-bsc/lcs_loc_req.c</span><br><span>+++ b/src/osmo-bsc/lcs_loc_req.c</span><br><span>@@ -313,7 +313,7 @@</span><br><span> plr.bssmap_le.perform_loc_req.apdu = (struct bsslap_pdu){</span><br><span> .msg_type = BSSLAP_MSGT_TA_LAYER3,</span><br><span> .ta_layer3 = {</span><br><span style="color: hsl(0, 100%, 40%);">- .ta = lchan->rqd_ta,</span><br><span style="color: hsl(120, 100%, 40%);">+ .ta = lchan->last_ta,</span><br><span> },</span><br><span> };</span><br><span> } else {</span><br><span>@@ -365,7 +365,7 @@</span><br><span> .msg_type = BSSLAP_MSGT_RESET,</span><br><span> .reset = {</span><br><span> .cell_id = lchan->ts->trx->bts->cell_identity,</span><br><span style="color: hsl(0, 100%, 40%);">- .ta = lchan->rqd_ta,</span><br><span style="color: hsl(120, 100%, 40%);">+ .ta = lchan->last_ta,</span><br><span> .cause = BSSLAP_CAUSE_INTRA_BSS_HO,</span><br><span> },</span><br><span> };</span><br><span>diff --git a/src/osmo-bsc/lcs_ta_req.c b/src/osmo-bsc/lcs_ta_req.c</span><br><span>index 97d6eb5..3b859a7 100644</span><br><span>--- a/src/osmo-bsc/lcs_ta_req.c</span><br><span>+++ b/src/osmo-bsc/lcs_ta_req.c</span><br><span>@@ -210,7 +210,7 @@</span><br><span> .msg_type = BSSLAP_MSGT_TA_RESPONSE,</span><br><span> .ta_response = {</span><br><span> .cell_id = lchan->ts->trx->bts->cell_identity,</span><br><span style="color: hsl(0, 100%, 40%);">- .ta = lchan->rqd_ta,</span><br><span style="color: hsl(120, 100%, 40%);">+ .ta = lchan->last_ta,</span><br><span> },</span><br><span> },</span><br><span> },</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/22511">change 22511</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/22511"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1049526a173819baeb4978db5bf018ba3f1006a0 </div>
<div style="display:none"> Gerrit-Change-Number: 22511 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>