Change in osmo-pcu[master]: gsm_rlcmac.h: Make sure we have a corresponding 'u' member to RlcMacD...

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Tue Jan 28 21:38:29 UTC 2020


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17042 )

Change subject: gsm_rlcmac.h: Make sure we have a corresponding 'u' member to RlcMacDownlink_t for every call
......................................................................

gsm_rlcmac.h: Make sure we have a corresponding 'u' member to RlcMacDownlink_t for every call

Port from wireshark.git commit 6c32ba5ff1a5f5ec2426d1d2c4f4f37fd136bab0.

Ported-by: Pau Espin Pedrol <pespin at sysmocom.de>
Change-Id: I989befc56fa37b8f982301f4f9aa4f4533e3e87a
---
M src/gsm_rlcmac.h
1 file changed, 35 insertions(+), 25 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h
index 6c82669..196ced2 100644
--- a/src/gsm_rlcmac.h
+++ b/src/gsm_rlcmac.h
@@ -4900,35 +4900,45 @@
   union
   {
     guint8                                MESSAGE_TYPE;
-
-    Packet_Access_Reject_t                Packet_Access_Reject;
-    Packet_Cell_Change_Order_t            Packet_Cell_Change_Order;
-    Packet_Downlink_Assignment_t          Packet_Downlink_Assignment;
-    Packet_Measurement_Order_Reduced_t    Packet_Measurement_Order;
-    Packet_Neighbour_Cell_Data_t          Packet_Neighbour_Cell_Data;
-    Packet_Serving_Cell_Data_t            Packet_Serving_Cell_Data;
-    Packet_Paging_Request_t               Packet_Paging_Request;
-    Packet_PDCH_Release_t                 Packet_PDCH_Release;
-    Packet_Polling_Request_t              Packet_Polling_Request;
-    Packet_Power_Control_Timing_Advance_t Packet_Power_Control_Timing_Advance;
-    Packet_PRACH_Parameters_t             Packet_PRACH_Parameters;
-    Packet_Queueing_Notification_t        Packet_Queueing_Notification;
-    Packet_Timeslot_Reconfigure_t         Packet_Timeslot_Reconfigure;
-    Packet_TBF_Release_t                  Packet_TBF_Release;
-    Packet_Uplink_Ack_Nack_t              Packet_Uplink_Ack_Nack;
-    Packet_Uplink_Assignment_t            Packet_Uplink_Assignment;
-    Packet_Cell_Change_Continue_t         Packet_Cell_Change_Continue;
-    Packet_Handover_Command_t             Packet_Handover_Command;
-    Packet_PhysicalInformation_t          Packet_PhysicalInformation;
-    Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block;
-
+    Additional_MS_Rad_Access_Cap_t        Additional_MS_Rad_Access_Cap;
+    EGPRS_PD_AckNack_t                    EGPRS_PD_AckNack;
+    PSI13_t                               PSI13;
     PSI1_t                                PSI1;
     PSI2_t                                PSI2;
     PSI3_t                                PSI3;
-    PSI3_BIS_t                            PSI3_BIS;
-    PSI4_t                                PSI4;
-    PSI13_t                               PSI13;
     PSI5_t                                PSI5;
+    Packet_Access_Reject_t                Packet_Access_Reject;
+    Packet_Cell_Change_Continue_t         Packet_Cell_Change_Continue;
+    Packet_Cell_Change_Failure_t          Packet_Cell_Change_Failure;
+    Packet_Cell_Change_Notification_t     Packet_Cell_Change_Notification;
+    Packet_Cell_Change_Order_t            Packet_Cell_Change_Order;
+    Packet_Control_Acknowledgement_t      Packet_Control_Acknowledgement;
+    Packet_Downlink_Ack_Nack_t            Packet_Downlink_Ack_Nack;
+    Packet_Downlink_Assignment_t          Packet_Downlink_Assignment;
+    Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block;
+    Packet_Enh_Measurement_Report_t       Packet_Enh_Measurement_Report;
+    Packet_Handover_Command_t             Packet_Handover_Command;
+    Packet_Measurement_Order_t            Packet_Measurement_Order;
+    Packet_Measurement_Report_t           Packet_Measurement_Report;
+    Packet_Mobile_TBF_Status_t            Packet_Mobile_TBF_Status;
+    Packet_Neighbour_Cell_Data_t          Packet_Neighbour_Cell_Data;
+    Packet_PDCH_Release_t                 Packet_PDCH_Release;
+    Packet_PRACH_Parameters_t             Packet_PRACH_Parameters;
+    Packet_PSI_Status_t                   Packet_PSI_Status;
+    Packet_Paging_Request_t               Packet_Paging_Request;
+    Packet_Pause_t                        Packet_Pause;
+    Packet_PhysicalInformation_t          Packet_PhysicalInformation;
+    Packet_Polling_Request_t              Packet_Polling_Request;
+    Packet_Power_Control_Timing_Advance_t Packet_Power_Control_Timing_Advance;
+    Packet_Queueing_Notification_t        Packet_Queueing_Notification;
+    Packet_Resource_Request_t             Packet_Resource_Request;
+    Packet_SI_Status_t                    Packet_SI_Status;
+    Packet_Serving_Cell_Data_t            Packet_Serving_Cell_Data;
+    Packet_TBF_Release_t                  Packet_TBF_Release;
+    Packet_Timeslot_Reconfigure_t         Packet_Timeslot_Reconfigure;
+    Packet_Uplink_Ack_Nack_t              Packet_Uplink_Ack_Nack;
+    Packet_Uplink_Assignment_t            Packet_Uplink_Assignment;
+    Packet_Uplink_Dummy_Control_Block_t   Packet_Uplink_Dummy_Control_Block;
   } u;
 
   /* NrOfBits is placed after union to avoid unnecessary code changes when addressing the union members

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17042
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I989befc56fa37b8f982301f4f9aa4f4533e3e87a
Gerrit-Change-Number: 17042
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200128/1e43e552/attachment.htm>


More information about the gerrit-log mailing list