pespin has uploaded this change for review.
bts_model_apply_oml(): Drop unneded code
Only calls to bts_model_apply_oml() are done from BTS, RCARRIER and
RCHANNEL NM Objects only in their respective FSMs. This function is
never called with any of the GPRS NM objects.
These NM Objectes have the NM_MT_IPACC_SET_ATTR msg ACKED/NACKED in its
own path:
oml_ipa_set_attr()
rc = oml_ipa_mo_set_attr()
return oml_fom_ack_nack(msg, rc);
Change-Id: I1a0d38a122f50ffe749ebc4f1cc11235ca516586
---
M src/osmo-bts-lc15/oml.c
M src/osmo-bts-oc2g/oml.c
M src/osmo-bts-octphy/l1_oml.c
M src/osmo-bts-omldummy/bts_model.c
M src/osmo-bts-sysmo/oml.c
M src/osmo-bts-trx/l1_if.c
M src/osmo-bts-virtual/bts_model.c
7 files changed, 19 insertions(+), 56 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/95/32195/1
diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c
index d702da7..1842008 100644
--- a/src/osmo-bts-lc15/oml.c
+++ b/src/osmo-bts-lc15/oml.c
@@ -1814,14 +1814,6 @@
struct gsm_bts_trx *trx;
struct lc15l1_hdl *fl1h;
- /* TODO: NM Object without FSM: */
- switch (foh->obj_class) {
- case NM_OC_GPRS_NSE:
- case NM_OC_GPRS_CELL:
- case NM_OC_GPRS_NSVC:
- return oml_fom_ack_nack(ev_data.msg, ev_data.cause);
- }
-
switch (foh->msg_type) {
case NM_MT_SET_RADIO_ATTR:
trx = obj;
diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c
index dfcb4a6..98c2fbc 100644
--- a/src/osmo-bts-oc2g/oml.c
+++ b/src/osmo-bts-oc2g/oml.c
@@ -1824,14 +1824,6 @@
struct oc2gl1_hdl *fl1h;
uint8_t cell_size;
- /* TODO: NM Object without FSM: */
- switch (foh->obj_class) {
- case NM_OC_GPRS_NSE:
- case NM_OC_GPRS_CELL:
- case NM_OC_GPRS_NSVC:
- return oml_fom_ack_nack(ev_data.msg, ev_data.cause);
- }
-
switch (foh->msg_type) {
case NM_MT_SET_RADIO_ATTR:
trx = obj;
diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c
index 1e64e8d..01e3d56 100644
--- a/src/osmo-bts-octphy/l1_oml.c
+++ b/src/osmo-bts-octphy/l1_oml.c
@@ -1754,14 +1754,6 @@
int rc;
struct gsm_bts_trx *trx;
- /* TODO: NM Object without FSM: */
- switch (foh->obj_class) {
- case NM_OC_GPRS_NSE:
- case NM_OC_GPRS_CELL:
- case NM_OC_GPRS_NSVC:
- return oml_fom_ack_nack(ev_data.msg, ev_data.cause);
- }
-
switch (foh->msg_type) {
case NM_MT_SET_RADIO_ATTR:
trx = obj;
diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c
index 46fa84b..7fb58f7 100644
--- a/src/osmo-bts-omldummy/bts_model.c
+++ b/src/osmo-bts-omldummy/bts_model.c
@@ -104,14 +104,6 @@
};
int rc;
- /* TODO: NM Object without FSM: */
- switch (foh->obj_class) {
- case NM_OC_GPRS_NSE:
- case NM_OC_GPRS_CELL:
- case NM_OC_GPRS_NSVC:
- return oml_fom_ack_nack(ev_data.msg, ev_data.cause);
- }
-
switch (foh->msg_type) {
case NM_MT_SET_BTS_ATTR:
ev_data.cause = vbts_set_bts(obj);
diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c
index 4be222c..67e1275 100644
--- a/src/osmo-bts-sysmo/oml.c
+++ b/src/osmo-bts-sysmo/oml.c
@@ -1727,14 +1727,6 @@
struct gsm_bts_trx *trx;
struct femtol1_hdl *fl1h;
- /* TODO: NM Object without FSM: */
- switch (foh->obj_class) {
- case NM_OC_GPRS_NSE:
- case NM_OC_GPRS_CELL:
- case NM_OC_GPRS_NSVC:
- return oml_fom_ack_nack(ev_data.msg, ev_data.cause);
- }
-
switch (foh->msg_type) {
case NM_MT_SET_RADIO_ATTR:
trx = obj;
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index 2ed1868..57a4c41 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -559,14 +559,6 @@
};
int rc;
- /* TODO: NM Object without FSM: */
- switch (foh->obj_class) {
- case NM_OC_GPRS_NSE:
- case NM_OC_GPRS_CELL:
- case NM_OC_GPRS_NSVC:
- return oml_fom_ack_nack(ev_data.msg, ev_data.cause);
- }
-
switch (foh->msg_type) {
case NM_MT_SET_BTS_ATTR:
ev_data.cause = trx_set_bts(obj, new_attr);
diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c
index 64e2f8d..57e5304 100644
--- a/src/osmo-bts-virtual/bts_model.c
+++ b/src/osmo-bts-virtual/bts_model.c
@@ -139,14 +139,6 @@
};
int rc;
- /* TODO: NM Object without FSM: */
- switch (foh->obj_class) {
- case NM_OC_GPRS_NSE:
- case NM_OC_GPRS_CELL:
- case NM_OC_GPRS_NSVC:
- return oml_fom_ack_nack(ev_data.msg, ev_data.cause);
- }
-
switch (foh->msg_type) {
case NM_MT_SET_BTS_ATTR:
ev_data.cause = vbts_set_bts(obj);
To view, visit change 32195. To unsubscribe, or for help writing mail filters, visit settings.