Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 17 insertions, 17 deletions

diff --git a/ui/qt/lte_mac_statistics_dialog.h b/ui/qt/lte_mac_statistics_dialog.h
index 411d0614..c3ea692d 100644
--- a/ui/qt/lte_mac_statistics_dialog.h
+++ b/ui/qt/lte_mac_statistics_dialog.h
@@ -18,20 +18,20 @@
 #include <ui/qt/models/percent_bar_delegate.h>
 
 // Common channel stats
-typedef struct mac_lte_common_stats {
-    guint32 all_frames;
-    guint32 mib_frames;
-    guint32 sib_frames;
-    guint32 sib_bytes;
-    guint32 pch_frames;
-    guint32 pch_bytes;
-    guint32 pch_paging_ids;
-    guint32 rar_frames;
-    guint32 rar_entries;
-
-    guint16  max_ul_ues_in_tti;
-    guint16  max_dl_ues_in_tti;
-} mac_lte_common_stats;
+typedef struct mac_3gpp_common_stats {
+    uint32_t all_frames;
+    uint32_t mib_frames;
+    uint32_t sib_frames;
+    uint32_t sib_bytes;
+    uint32_t pch_frames;
+    uint32_t pch_bytes;
+    uint32_t pch_paging_ids;
+    uint32_t rar_frames;
+    uint32_t rar_entries;
+
+    uint16_t max_ul_ues_in_tti;
+    uint16_t max_dl_ues_in_tti;
+} mac_3gpp_common_stats;
 
 
 class LteMacStatisticsDialog : public TapParameterDialog
@@ -55,15 +55,15 @@ private:
 
     // Callbacks for register_tap_listener
     static void tapReset(void *ws_dlg_ptr);
-    static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *mac_lte_tap_info_ptr, tap_flags_t flags);
+    static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *mac_3gpp_tap_info_ptr, tap_flags_t flags);
     static void tapDraw(void *ws_dlg_ptr);
 
     virtual const QString filterExpression();
 
     // Common stats.
-    mac_lte_common_stats commonStats_;
+    mac_3gpp_common_stats commonStats_;
     bool commonStatsCurrent_;          // Set when changes have not yet been drawn
-    void updateCommonStats(const struct mac_lte_tap_info *mlt_info);
+    void updateCommonStats(const struct mac_3gpp_tap_info *mlt_info);
     void drawCommonStats();
     void clearCommonStats();