Add the packet number to the packet_info structure, and use it.

That removes most of the uses of the frame number field in the
frame_data structure.

Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22
Reviewed-on: https://code.wireshark.org/review/13509
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 5 insertions, 5 deletions

diff --git a/epan/dissectors/packet-acr122.c b/epan/dissectors/packet-acr122.c
index f4d027e439..9cc1ae5ffa 100644
--- a/epan/dissectors/packet-acr122.c
+++ b/epan/dissectors/packet-acr122.c
@@ -256,7 +256,7 @@ dissect_acr122(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
     k_bus_id  = bus_id;
     k_device_address  = device_address;
     k_endpoint        = endpoint;
-    k_frame_number    = pinfo->fd->num;
+    k_frame_number    = pinfo->num;
 
     key[0].length = 1;
     key[0].key = &k_bus_id;
@@ -472,7 +472,7 @@ dissect_acr122(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
             command_data->endpoint = endpoint;
 
             command_data->command = command;
-            command_data->command_frame_number = pinfo->fd->num;
+            command_data->command_frame_number = pinfo->num;
             command_data->response_frame_number = 0;
 
             wmem_tree_insert32_array(command_info, key, command_data);
@@ -488,15 +488,15 @@ dissect_acr122(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 
         wmem_tree = (wmem_tree_t *) wmem_tree_lookup32_array(command_info, key);
         if (wmem_tree) {
-            command_data = (command_data_t *) wmem_tree_lookup32_le(wmem_tree, pinfo->fd->num);
+            command_data = (command_data_t *) wmem_tree_lookup32_le(wmem_tree, pinfo->num);
 
             if (command_data && (command_data->response_frame_number == 0 ||
-                    command_data->response_frame_number == pinfo->fd->num)) {
+                    command_data->response_frame_number == pinfo->num)) {
 
                 command = command_data->command;
                 command_frame_number = command_data->command_frame_number;
                 if (!pinfo->fd->flags.visited && command_data->response_frame_number == 0) {
-                    command_data->response_frame_number = pinfo->fd->num;
+                    command_data->response_frame_number = pinfo->num;
                 }
             }
         }