Change in osmo-pcu[master]: gprs_ms: Avoid enabling EGPRS if no MCS are supported
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/21046 )
Change subject: gprs_ms: Avoid enabling EGPRS if no MCS are supported
..
gprs_ms: Avoid enabling EGPRS if no MCS are supported
This patch avoids enabling EGPRS on MS objects if BTS/VTY assigned no
MCS supported/available for use.
As a result, if NO MCS is enabled/supported EGPRS won't be used despite
the MS announcing through EGPRS MS class that it supports EGPRS.
Change-Id: Ib19e9e006d851c2147de15f4aec36ab65250bdd3
---
M src/gprs_ms.cpp
M src/tbf.cpp
2 files changed, 8 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/gprs_ms.cpp b/src/gprs_ms.cpp
index b295686..8eb23d9 100644
--- a/src/gprs_ms.cpp
+++ b/src/gprs_ms.cpp
@@ -541,6 +541,13 @@
m_egprs_ms_class = ms_class_;
+ if (!m_bts->max_mcs_ul() || !m_bts->max_mcs_dl()) {
+ LOGPMS(this, DRLCMAC, LOGL_DEBUG,
+ "Avoid enabling EGPRS because use of MCS is disabled:
ul=%u dl=%u\n",
+ m_bts->max_mcs_ul(), m_bts->max_mcs_dl());
+ return;
+ }
+
if (mcs_is_edge_gmsk(mcs_get_egprs_by_num(m_bts->max_mcs_ul())) &&
mcs_is_edge_gmsk(mcs_get_egprs_by_num(m_bts->max_mcs_dl())) &&
mode() != EGPRS)
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 4f685e8..2371aed 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -745,7 +745,7 @@
struct gprs_rlcmac_bts *bts_data = bts->bts_data();
int rc;
- if (m_ms->egprs_ms_class() > 0)
+ if (m_ms->mode() != GPRS)
enable_egprs();
m_created_ts = time(NULL);
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/21046
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ib19e9e006d851c2147de15f4aec36ab65250bdd3
Gerrit-Change-Number: 21046
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-pcu[master]: gprs_ms: Avoid enabling EGPRS if no MCS are supported
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/21046 ) Change subject: gprs_ms: Avoid enabling EGPRS if no MCS are supported .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/21046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib19e9e006d851c2147de15f4aec36ab65250bdd3 Gerrit-Change-Number: 21046 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 10:33:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: gprs_ms: Avoid enabling EGPRS if no MCS are supported
Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/21046 to look at the new patch set (#3). Change subject: gprs_ms: Avoid enabling EGPRS if no MCS are supported .. gprs_ms: Avoid enabling EGPRS if no MCS are supported This patch avoids enabling EGPRS on MS objects if BTS/VTY assigned no MCS supported/available for use. As a result, if NO MCS is enabled/supported EGPRS won't be used despite the MS announcing through EGPRS MS class that it supports EGPRS. Change-Id: Ib19e9e006d851c2147de15f4aec36ab65250bdd3 --- M src/gprs_ms.cpp M src/tbf.cpp 2 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/21046/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/21046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib19e9e006d851c2147de15f4aec36ab65250bdd3 Gerrit-Change-Number: 21046 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: gprs_ms: Avoid enabling EGPRS if no MCS are supported
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/21046 ) Change subject: gprs_ms: Avoid enabling EGPRS if no MCS are supported .. Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/21046/2/src/gprs_ms.cpp File src/gprs_ms.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/21046/2/src/gprs_ms.cpp@546 PS2, Line 546: Avoid enabling This sounds like a recommendation to the user who reads logs, 'Not enabling' fits better IMHO. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/21046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib19e9e006d851c2147de15f4aec36ab65250bdd3 Gerrit-Change-Number: 21046 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 04 Nov 2020 21:25:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: gprs_ms: Avoid enabling EGPRS if no MCS are supported
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/21046 )
Change subject: gprs_ms: Avoid enabling EGPRS if no MCS are supported
..
gprs_ms: Avoid enabling EGPRS if no MCS are supported
This patch avoids enabling EGPRS on MS objects if BTS/VTY assigned no
MCS supported/available for use.
As a result, if NO MCS is enabled/supported EGPRS won't be used despite
the MS announcing through EGPRS MS class that it supports EGPRS.
Change-Id: Ib19e9e006d851c2147de15f4aec36ab65250bdd3
---
M src/gprs_ms.cpp
M src/tbf.cpp
2 files changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/21046/1
diff --git a/src/gprs_ms.cpp b/src/gprs_ms.cpp
index b295686..8eb23d9 100644
--- a/src/gprs_ms.cpp
+++ b/src/gprs_ms.cpp
@@ -541,6 +541,13 @@
m_egprs_ms_class = ms_class_;
+ if (!m_bts->max_mcs_ul() || !m_bts->max_mcs_dl()) {
+ LOGPMS(this, DRLCMAC, LOGL_DEBUG,
+ "Avoid enabling EGPRS because use of MCS is disabled:
ul=%u dl=%u\n",
+ m_bts->max_mcs_ul(), m_bts->max_mcs_dl());
+ return;
+ }
+
if (mcs_is_edge_gmsk(mcs_get_egprs_by_num(m_bts->max_mcs_ul())) &&
mcs_is_edge_gmsk(mcs_get_egprs_by_num(m_bts->max_mcs_dl())) &&
mode() != EGPRS)
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 4f685e8..2371aed 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -745,7 +745,7 @@
struct gprs_rlcmac_bts *bts_data = bts->bts_data();
int rc;
- if (m_ms->egprs_ms_class() > 0)
+ if (m_ms->mode() != GPRS)
enable_egprs();
m_created_ts = time(NULL);
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/21046
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ib19e9e006d851c2147de15f4aec36ab65250bdd3
Gerrit-Change-Number: 21046
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
