edge: Rename gprs_rlc_ul_header_egprs and gprs_rlc_ul_data_block_info

These struct names are more specific than necessary. They are used
for GPRS (uplink) already. In downlink direction, only a few fields
will be added to the header struct. Add addition,
gprs_rlc_ul_header_egprs does not map directly to an encoded
header, like many other 'header' structs do.

Change the names to fit both modes and both directions:

  gprs_rlc_ul_header_egprs    -> gprs_rlc_data_info
  gprs_rlc_ul_data_block_info -> gprs_rlc_data_block_info

Sponsored-by: On-Waves ehf

1 files changed, 2 insertions, 2 deletions

diff --git a/src/tbf.h b/src/tbf.h
index fbf7c82e..c0fee0e9 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -413,7 +413,7 @@ struct gprs_rlcmac_ul_tbf : public gprs_rlcmac_tbf {
 
 	/* blocks were acked */
 	int rcv_data_block_acknowledged(
-		const struct gprs_rlc_ul_header_egprs *rlc,
+		const struct gprs_rlc_data_info *rlc,
 		uint8_t *data, uint8_t len, struct pcu_l1_meas *meas);
 
 
@@ -434,7 +434,7 @@ struct gprs_rlcmac_ul_tbf : public gprs_rlcmac_tbf {
 	uint8_t m_final_ack_sent; /* set if we sent final ack */
 
 protected:
-	void maybe_schedule_uplink_acknack(const gprs_rlc_ul_header_egprs *rlc);
+	void maybe_schedule_uplink_acknack(const gprs_rlc_data_info *rlc);
 };
 
 inline enum gprs_rlcmac_tbf_direction reverse(enum gprs_rlcmac_tbf_direction dir)