From f4b3cb0917c4e0f95b356cdcf2f64cc18d5accc2 Mon Sep 17 00:00:00 2001 From: Martin Mathieson Date: Sun, 16 Jun 2013 15:11:21 +0000 Subject: [PATCH] Clarify interface/test for DL HARQ id, and remove a trailing comma from an enum. svn path=/trunk/; revision=49961 --- epan/dissectors/packet-mac-lte.c | 2 +- epan/dissectors/packet-mac-lte.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index 616db0d77c..dde4608cd9 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -1991,7 +1991,7 @@ static void TrackReportedDLHARQResend(packet_info *pinfo, tvbuff_t *tvb, volatil guint8 transport_block = p_mac_lte_info->detailed_phy_info.dl_info.transport_block; /* Check harq-id bounds, give up if invalid */ - if ((harq_id >= 15) || (transport_block+1 > 2)) { + if ((harq_id >= 15) || (transport_block > 1)) { return; } diff --git a/epan/dissectors/packet-mac-lte.h b/epan/dissectors/packet-mac-lte.h index 1d16e78a3e..6654c13e3e 100644 --- a/epan/dissectors/packet-mac-lte.h +++ b/epan/dissectors/packet-mac-lte.h @@ -94,7 +94,7 @@ typedef enum mac_lte_carrier_id { carrier_id_secondary_1, carrier_id_secondary_2, carrier_id_secondary_3, - carrier_id_secondary_4, + carrier_id_secondary_4 } mac_lte_carrier_id; /* Context info attached to each LTE MAC frame */ @@ -164,7 +164,7 @@ typedef struct mac_lte_info mac_lte_crc_status crc_status; guint8 harq_id; gboolean ndi; - guint8 transport_block; /* 1..2 */ + guint8 transport_block; /* 0..1 */ } dl_info; } detailed_phy_info;