fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/35858?usp=email )
Change subject: rlcmac: uncomment RLC/MAC msg_type checking in DATA.cnf ......................................................................
rlcmac: uncomment RLC/MAC msg_type checking in DATA.cnf
Change-Id: I4a0c553201d51453d9197d254f796f6574a2dab0 --- M src/rlcmac/rlcmac_prim.c 1 file changed, 11 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/58/35858/1
diff --git a/src/rlcmac/rlcmac_prim.c b/src/rlcmac/rlcmac_prim.c index 496554e..9f7d572 100644 --- a/src/rlcmac/rlcmac_prim.c +++ b/src/rlcmac/rlcmac_prim.c @@ -649,17 +649,14 @@ static int rlcmac_prim_handle_l1ctl_pdch_data_cnf(struct osmo_gprs_rlcmac_prim *rlcmac_prim) { struct gprs_rlcmac_entity *gre; - -#if 0 - /* TODO: enable once we have originating req data in primitive coming from lower layers. */ - /* 3GPP TS 44.060 10.3.2 Uplink RLC/MAC control block: */ enum osmo_gprs_rlcmac_ul_msg_type msg_type; + + /* 3GPP TS 44.060 10.3.2 Uplink RLC/MAC control block: */ if (rlcmac_prim->l1ctl.pdch_data_cnf.data_len < 1) return -EINVAL; msg_type = (rlcmac_prim->l1ctl.pdch_data_cnf.data & 0xC0) >> 2; if (msg_type != OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CONTROL_ACK) return -EINVAL; -#endif
llist_for_each_entry(gre, &g_rlcmac_ctx->gre_list, entry) { if (!gre->ul_tbf)