edge: Compare len instead of using cs.isCombinable

Comparing the coding scheme properties doesn't seem to be strong
enough, since create_dl_acked_block(fn, ts, index, index2) sometimes
had to combine data units of different size this way.

Check the registered size of the BSN blocks instead, since these must
match if two blocks are to be combined in a single RLC data message
with MCS7-9.

It is not yet clear, what exactly goes wrong with the current
implementation, but this commit fixes the problem which trigger the
assertion in create_dl_acked_block.

Sponsored-by: On-Waves ehf

1 files changed, 1 insertions, 1 deletions

diff --git a/src/tbf.h b/src/tbf.h
index 6c030d23..ad8ad4c2 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -407,7 +407,7 @@ protected:
 	};
 
 	int take_next_bsn(uint32_t fn, int previous_bsn,
-		GprsCodingScheme *next_cs);
+		bool *may_combine);
 	bool restart_bsn_cycle();
 	int create_new_bsn(const uint32_t fn, GprsCodingScheme cs);
 	struct msgb *create_dl_acked_block(const uint32_t fn, const uint8_t ts,