laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/26144 )
Change subject: abis_rsl: permit simultaneous ACCH repetition and overpower
......................................................................
abis_rsl: permit simultaneous ACCH repetition and overpower
As stated in "GSM/EDGE Evolution and Performance", section 12.3,
both features *can* be enabled simultaneously.
Change-Id: I2189f01bd78625dab3d642597240338ee581fc98
Related: SYS#5319
---
M src/osmo-bsc/abis_rsl.c
1 file changed, 3 insertions(+), 18 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c
index 0291224..423c2b8 100644
--- a/src/osmo-bsc/abis_rsl.c
+++ b/src/osmo-bsc/abis_rsl.c
@@ -555,30 +555,15 @@
/* indicate Temporary overpower of SACCH and FACCH channels */
static void top_acch_cap_for_bts(struct gsm_lchan *lchan, struct msgb *msg)
{
- struct abis_rsl_osmo_temp_ovp_acch_cap cap;
struct gsm_bts *bts = lchan->ts->trx->bts;
- bool acch_rep_enabled;
- bool acch_rep_supp_by_ms;
/* The BTS_FEAT_ACCH_TEMP_OVP IE is a proprietary IE, that can only be
used with osmo-bts type BTSs */
if (!(bts->model->type == GSM_BTS_TYPE_OSMOBTS &&
osmo_bts_has_feature(&bts->features, BTS_FEAT_ACCH_TEMP_OVP)))
return;
- memcpy(&cap, &bts->temporary_overpower, sizeof(cap));
-
- /* The user has enabled one of the two downlink related ACCH repetition
features. */
- acch_rep_enabled = bts->repeated_acch_policy.dl_sacch ||
bts->repeated_acch_policy.dl_facch_all
- || bts->repeated_acch_policy.dl_facch_cmd;
-
- /* The MS indicates support for ACCH repetition */
- acch_rep_supp_by_ms = lchan->conn && lchan->conn->cm3_valid &&
lchan->conn->cm3.repeated_acch_capability;
-
- /* If the MS fully supports repeated ACCH capabilites as specified in
3GPP TS 44.006, section 10 and 11. and if
- * ACCH repetition is enabled for this BTS, then we will not apply
temporary overpower. */
- if (acch_rep_enabled && acch_rep_supp_by_ms)
- cap.overpower_db = 0;
-
- msgb_tlv_put(msg, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP, sizeof(cap),
(uint8_t*) &cap);
+ msgb_tlv_put(msg, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP,
+ sizeof(bts->temporary_overpower),
+ (void *)&bts->temporary_overpower);
}
/* Write RSL_IE_OSMO_TRAINING_SEQUENCE to msgb. The tsc_set argument's range
is 1-4, tsc argument range is 0-7. */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26144
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I2189f01bd78625dab3d642597240338ee581fc98
Gerrit-Change-Number: 26144
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pma...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-CC: neels <nhofm...@sysmocom.de>
Gerrit-MessageType: merged
