aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2019-05-23 20:00:48 +0200
committerHarald Welte <laforge@gnumonks.org>2019-05-24 00:02:35 +0200
commitbf5d8eed1103ea295bb63718a2f6330d9fbebb5d (patch)
treea1f08f8160bdff8ff54c8d6a3994ebdfafdd5ed2
parent29aee05f7541147e78b001e6c6425c238db83760 (diff)
RSL: Fix logic about fixed/dynamic MS power control in MS POWER COMMAND
The spec is quite clear: If the MS Power Parameters IE is present, then the BTS shall perform autonomous MS power control. If it's absent, then the MS power shall be fied. Let's adjust our code accordingly. Change-Id: Ie43a1fc9cc658677c8c945ae82d03b7bffbe52d5 Related: OS#1622
-rw-r--r--src/common/rsl.c27
1 files changed, 21 insertions, 6 deletions
diff --git a/src/common/rsl.c b/src/common/rsl.c
index e6fbe6f..e6fd8b9 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1554,19 +1554,34 @@ static int rsl_rx_mode_modif(struct msgb *msg)
/* 8.4.15 MS POWER CONTROL */
static int rsl_rx_ms_pwr_ctrl(struct msgb *msg)
{
+ struct abis_rsl_dchan_hdr *dch = msgb_l2(msg);
struct gsm_lchan *lchan = msg->lchan;
struct tlv_parsed tp;
+ uint8_t pwr;
rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg));
- if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) {
- uint8_t pwr = *TLVP_VAL(&tp, RSL_IE_MS_POWER) & 0x1F;
- lchan->ms_power_ctrl.fixed = 1;
- lchan->ms_power_ctrl.current = pwr;
- LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "forcing power to %d\n", lchan->ms_power_ctrl.current);
- bts_model_adjst_ms_pwr(lchan);
+ /* 9.3.13 MS Power (M) */
+ if (!TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1))
+ return rsl_tx_error_report(msg->trx, RSL_ERR_MAND_IE_ERROR, &dch->chan_nr, NULL, msg);
+
+ pwr = *TLVP_VAL(&tp, RSL_IE_MS_POWER) & 0x1F;
+ lchan->ms_power_ctrl.current = pwr;
+
+ LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "forcing power to %d\n", lchan->ms_power_ctrl.current);
+
+ /* 9.3.31 MS Power Parameters (O) */
+ if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM))
+ lchan->ms_power_ctrl.fixed = 0;
+ else {
+ /* Spec explicitly states BTS should only perform
+ * autonomous MS power control loop in BTS if 'MS Power
+ * Parameters' IE is present! */
+ lchan->ms_power_ctrl.fixed = 1;
}
+ bts_model_adjst_ms_pwr(lchan);
+
return 0;
}