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, 3 insertions, 3 deletions

diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index c5e0f03abf..bf14a8667e 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -17785,7 +17785,7 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo,
           if (result && (result->seq_control == seq_control)) {
             /* keep a pointer to the first seen frame, could be done with proto data? */
             fnum = result->fnum;
-            g_hash_table_insert(fc_first_frame_table, GINT_TO_POINTER(pinfo->fd->num),
+            g_hash_table_insert(fc_first_frame_table, GINT_TO_POINTER(pinfo->num),
                                 GINT_TO_POINTER(fnum));
             retransmitted = TRUE;
           } else {
@@ -17796,10 +17796,10 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo,
               g_hash_table_insert(fc_analyse_retransmit_table, result, result);
             }
             result->seq_control = seq_control;
-            result->fnum =  pinfo->fd->num;
+            result->fnum =  pinfo->num;
           }
         }
-        else if ((fnum = GPOINTER_TO_UINT(g_hash_table_lookup(fc_first_frame_table, GINT_TO_POINTER(pinfo->fd->num))))) {
+        else if ((fnum = GPOINTER_TO_UINT(g_hash_table_lookup(fc_first_frame_table, GINT_TO_POINTER(pinfo->num))))) {
           retransmitted = TRUE;
         }