fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/32516 )
Change subject: trxcon: ignore TRXCON_EV_TX_DATA_CNF in TRXCON_ST_PACKET_DATA
......................................................................
trxcon: ignore TRXCON_EV_TX_DATA_CNF in TRXCON_ST_PACKET_DATA
Change-Id: Ie3c53ffbac1f1906cc97ef66eb74e24aee2cb2c4
Related: OS#5500
---
M src/host/trxcon/src/trxcon_fsm.c
M src/host/trxcon/src/trxcon_shim.c
2 files changed, 14 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/16/32516/1
diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c
index 219f0c0..598f2bd 100644
--- a/src/host/trxcon/src/trxcon_fsm.c
+++ b/src/host/trxcon/src/trxcon_fsm.c
@@ -614,6 +614,8 @@
l1sched_reset(trxcon->sched, false);
/* TODO: switch to (not implemented) TRXCON_ST_DCH_TUNING? */
break;
+ case TRXCON_EV_TX_DATA_CNF:
+ break;
default:
OSMO_ASSERT(0);
}
@@ -711,7 +713,8 @@
| S(TRXCON_EV_GPRS_UL_TBF_CFG_REQ)
| S(TRXCON_EV_GPRS_DL_TBF_CFG_REQ)
| S(TRXCON_EV_GPRS_UL_BLOCK_REQ)
- | S(TRXCON_EV_RX_DATA_IND),
+ | S(TRXCON_EV_RX_DATA_IND)
+ | S(TRXCON_EV_TX_DATA_CNF),
.onenter = &trxcon_st_packet_data_onenter,
.onleave = &trxcon_st_packet_data_onleave,
.action = &trxcon_st_packet_data_action,
diff --git a/src/host/trxcon/src/trxcon_shim.c
b/src/host/trxcon/src/trxcon_shim.c
index 4f56d85..8b42efe 100644
--- a/src/host/trxcon/src/trxcon_shim.c
+++ b/src/host/trxcon/src/trxcon_shim.c
@@ -110,7 +110,6 @@
0, 0, true);
}
- /* XXX: do not send for L1SCHED_DT_PACKET_DATA */
return osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_DATA_CNF, &cnf);
}
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32516
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ie3c53ffbac1f1906cc97ef66eb74e24aee2cb2c4
Gerrit-Change-Number: 32516
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <[email protected]>
Gerrit-MessageType: newchange
