From b2a872cd9fe4d712a263941bd4857b1a4aad5aed Mon Sep 17 00:00:00 2001
From: Martin Mathieson <martin.r.mathieson@googlemail.com>
Date: Mon, 5 Jul 2010 16:45:36 +0000
Subject: [PATCH] Show grant-subframe from context info.

svn path=/trunk/; revision=33437
---
 epan/dissectors/packet-catapult-dct2000.c | 5 +++++
 epan/dissectors/packet-mac-lte.c          | 8 +++++++-
 epan/dissectors/packet-mac-lte.h          | 4 +++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index b0c3869a8c..340a2d90c3 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -1429,6 +1429,11 @@ static void attach_mac_lte_info(packet_info *pinfo)
         }
     }
 
+    if (p_mac_lte_info->direction == DIRECTION_UPLINK) {
+        p_mac_lte_info->subframeNumberOfGrantPresent = TRUE;
+        p_mac_lte_info->subframeNumberOfGrant = outhdr_values[i++];
+    }
+
     /* Store info in packet */
     p_add_proto_data(pinfo->fd, proto_mac_lte, p_mac_lte_info);
 }
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index 170f39dadd..a33c67059f 100644
--- a/epan/dissectors/packet-mac-lte.c
+++ b/epan/dissectors/packet-mac-lte.c
@@ -2959,6 +2959,12 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         p_mac_lte_info->subframeNumber = 9;
     }
 
+    if (p_mac_lte_info->subframeNumberOfGrantPresent) {
+        ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_grant_subframe_number,
+                                 tvb, 0, 0, p_mac_lte_info->subframeNumberOfGrant);
+        PROTO_ITEM_SET_GENERATED(ti);
+    }
+
     if (p_mac_lte_info->rntiType != NO_RNTI) {
         ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_rnti,
                                  tvb, 0, 0, p_mac_lte_info->rnti);
@@ -3747,7 +3753,7 @@ void proto_register_mac_lte(void)
         },
         { &hf_mac_lte_suspected_dl_retx_original_frame,
             { "Frame with previous tx",
-              "mac-lte.dlsch.retx.original_frame", FT_FRAMENUM, BASE_NONE, 0, 0x0,
+              "mac-lte.dlsch.retx.original-frame", FT_FRAMENUM, BASE_NONE, 0, 0x0,
               NULL, HFILL
             }
         },
diff --git a/epan/dissectors/packet-mac-lte.h b/epan/dissectors/packet-mac-lte.h
index 9d7a52d1e7..5230b7cbb9 100644
--- a/epan/dissectors/packet-mac-lte.h
+++ b/epan/dissectors/packet-mac-lte.h
@@ -88,7 +88,9 @@ typedef struct mac_lte_info
     /* Extra info to display */
     guint16         rnti;
     guint16         ueid;
-    guint16         subframeNumber;
+    guint8          subframeNumber;
+    gboolean        subframeNumberOfGrantPresent;
+    guint8          subframeNumberOfGrant;
     guint8          isPredefinedData;
     guint16         length;
     guint8          reTxCount;   /* UL */