aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2023-04-03 18:47:11 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2023-04-04 20:26:23 +0200
commit7a646f963b690e509784fc3cc60ca9dc2dc5d77a (patch)
treef00d50a8eaaa29d6de9af024d545bc191826902a
parent914e55caf35cda56fde8306b0e584b0f7763c51c (diff)
bts_model_apply_oml(): Drop unneded code
Calls to bts_model_apply_oml() are done only for BTS, RCARRIER and RCHANNEL NM Objects in their respective Rx code paths (and they will be moved to respective FSMs in follow up patches). 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
-rw-r--r--src/osmo-bts-lc15/oml.c8
-rw-r--r--src/osmo-bts-oc2g/oml.c8
-rw-r--r--src/osmo-bts-octphy/l1_oml.c8
-rw-r--r--src/osmo-bts-omldummy/bts_model.c8
-rw-r--r--src/osmo-bts-sysmo/oml.c8
-rw-r--r--src/osmo-bts-trx/l1_if.c8
-rw-r--r--src/osmo-bts-virtual/bts_model.c8
7 files changed, 0 insertions, 56 deletions
diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c
index d702da78..1842008a 100644
--- a/src/osmo-bts-lc15/oml.c
+++ b/src/osmo-bts-lc15/oml.c
@@ -1814,14 +1814,6 @@ int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
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 dfcb4a63..98c2fbc2 100644
--- a/src/osmo-bts-oc2g/oml.c
+++ b/src/osmo-bts-oc2g/oml.c
@@ -1824,14 +1824,6 @@ int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
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 1e64e8d8..01e3d56a 100644
--- a/src/osmo-bts-octphy/l1_oml.c
+++ b/src/osmo-bts-octphy/l1_oml.c
@@ -1754,14 +1754,6 @@ int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
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 46fa84b5..7fb58f76 100644
--- a/src/osmo-bts-omldummy/bts_model.c
+++ b/src/osmo-bts-omldummy/bts_model.c
@@ -104,14 +104,6 @@ int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
};
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 4be222cb..67e12750 100644
--- a/src/osmo-bts-sysmo/oml.c
+++ b/src/osmo-bts-sysmo/oml.c
@@ -1727,14 +1727,6 @@ int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
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 5f800ae2..4989bcc7 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -559,14 +559,6 @@ int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
};
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);
diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c
index 64e2f8dd..57e5304b 100644
--- a/src/osmo-bts-virtual/bts_model.c
+++ b/src/osmo-bts-virtual/bts_model.c
@@ -139,14 +139,6 @@ int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
};
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);