diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2021-10-31 12:14:46 +0300 |
|---|---|---|
| committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2021-11-04 15:46:04 +0300 |
| commit | 81a4b3c0904dd52b4ffff69034a9ab19b5baf3f8 (patch) | |
| tree | b94f975db0b6ba959f34391fab1620bd0c042952 | |
| parent | 110ec15fe9934edb9e1dacf996dda633b542b0be (diff) | |
measurement: get rid of *le in lchan_meas_handle_sacch()
The current Timing Advance value can be obtained either from the
L1 SACCH header (if received) or from lchan->ta_ctrl.current.
Change-Id: I2b3693a0e49f03f2b4496c9dbd30cf47e9bc86b5
| -rw-r--r-- | src/common/measurement.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/common/measurement.c b/src/common/measurement.c index 73c5e439..042f8b9a 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -782,9 +782,9 @@ void lchan_meas_reset(struct gsm_lchan *lchan) lchan->meas.last_fn = LCHAN_FN_DUMMY; } -static inline uint8_t ms_to2rsl(const struct gsm_lchan *lchan, const struct lapdm_entity *le) +static inline uint8_t ms_to2rsl(const struct gsm_lchan *lchan, uint8_t ta) { - return (lchan->ms_t_offs >= 0) ? lchan->ms_t_offs : (lchan->p_offs - le->ta); + return (lchan->ms_t_offs >= 0) ? lchan->ms_t_offs : (lchan->p_offs - ta); } static inline bool ms_to_valid(const struct gsm_lchan *lchan) @@ -898,7 +898,6 @@ void lchan_meas_handle_sacch(struct gsm_lchan *lchan, struct msgb *msg) const struct gsm48_meas_res *mr = NULL; const struct gsm48_hdr *gh = NULL; int timing_offset, rc; - struct lapdm_entity *le; bool dtxu_used = true; /* safe default assumption */ uint8_t ms_pwr; uint8_t ms_ta; @@ -932,9 +931,7 @@ void lchan_meas_handle_sacch(struct gsm_lchan *lchan, struct msgb *msg) ms_ta = lchan->ta_ctrl.current; } - le = &lchan->lapdm_ch.lapdm_acch; - - timing_offset = ms_to_valid(lchan) ? ms_to2rsl(lchan, le) : -1; + timing_offset = ms_to_valid(lchan) ? ms_to2rsl(lchan, ms_ta) : -1; rc = rsl_tx_meas_res(lchan, msgb_l3(msg), msgb_l3len(msg), timing_offset); if (rc == 0) /* Count successful transmissions */ lchan->meas.res_nr++; |