rlcmac: ul_tbf: Fix ul_state wrong check

This error was introduced when importing and rerwitting code from
osmo-pcu.git.

Fixes: 8c2734fa436c0e1a85be7a1b5a0c5131df99b190
Change-Id: Id4d7ad5fb393580a2e760513bb513ba968d2c1ef
---
M src/rlcmac/tbf_ul.c
M tests/rlcmac/rlcmac_prim_test.err
2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/rlcmac/tbf_ul.c b/src/rlcmac/tbf_ul.c
index 0b62610..d5e4439 100644
--- a/src/rlcmac/tbf_ul.c
+++ b/src/rlcmac/tbf_ul.c
@@ -265,7 +265,7 @@
 	if (ack_desc->FINAL_ACK_INDICATION) {
 		LOGPTBFUL(ul_tbf, LOGL_DEBUG, "Final ACK received.\n");
 		rc = gprs_rlcmac_ul_tbf_handle_final_ack(ul_tbf, dl_block);
-	} else if (gprs_rlcmac_tbf_ul_state(ul_tbf) &&
+	} else if (gprs_rlcmac_tbf_ul_state(ul_tbf) == GPRS_RLCMAC_TBF_UL_ST_FINISHED &&
 		   gprs_rlcmac_rlc_ul_window_window_empty(ul_tbf->ulw)) {
 		LOGPTBFUL(ul_tbf, LOGL_NOTICE,
 			  "Received acknowledge of all blocks, but without final ack indication (don't worry)\n");
diff --git a/tests/rlcmac/rlcmac_prim_test.err b/tests/rlcmac/rlcmac_prim_test.err
index e84461f..5e78c2b 100644
--- a/tests/rlcmac/rlcmac_prim_test.err
+++ b/tests/rlcmac/rlcmac_prim_test.err
@@ -420,7 +420,6 @@
 DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) V(B): (V(A)=1)""(V(S)-1=0)  A=Acked N=Nacked U=Unacked X=Resend-Unacked I=Invalid
 DLGLOBAL INFO UL_TBF{FLOW}: Received Event CONTENTION_RESOLUTION_SUCCESS
 DLGLOBAL INFO UL_TBF{FLOW}: Contention resolution succeeded, stop T3166
-DLGLOBAL NOTICE TBF(UL:NR-0:TLLI-00002342) Received acknowledge of all blocks, but without final ack indication (don't worry)
 DLGLOBAL INFO Rx from lower layers: L1CTL-PDCH_RTS.indication
 DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Sending new block at BSN 1, CS=CS-2
 DLGLOBAL DEBUG -- Chunk with length 7 is less than remaining space (30): add length header to delimit LLC frame

