[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8539d9e9d8cf6dbc688d13d10bb3d243896c5a1a
Submitter: Evan Huus (eapache@xxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

8539d9e by Hadriel Kaplan (hadrielk@xxxxxxxxx):

    Fix bug9931 'Encapsulated ethernet packets sometimes show invalid FCS'
    
    This fixes part-1 of bug9931: the uninitialized use of a wtap_pkthdr
    struct. The second part of the bug deals with dissectors calling
    the Ethernet dissector for ecnapsulated Ethernet packets but using
    the wrong dissector handle to do so. That's unrelated to the issue this
    commit addresses, so I'm splitting them up.
    
    Cherry-Picked-From: I87be7b736f82dd74d8c261062f88143372b5344c
    Reviewed-on: https://code.wireshark.org/review/848
    Reviewed-by: Hadriel Kaplan <hadrielk@xxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    
    Conflicts:
    	file.c
    	frame_tvbuff.c
    	reordercap.c
    	ui/gtk/packet_list_store.c
    	ui/qt/packet_list_model.cpp
    	ui/tap_export_pdu.c
    
    Change-Id: Ibc39d67e8a8717e70ddb453da3a868f6efb16bcc
    Bug:10052
    Reviewed-on: https://code.wireshark.org/review/2674
    Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
    

Actions performed:

    from  bf2d11f   Decrease TRAFFIC_CAPTURE_DURATION from 60s to 15s.
    adds  8539d9e   Fix bug9931 'Encapsulated ethernet packets sometimes show invalid FCS'


Summary of changes:
 proto_hier_stats.c          |    2 ++
 reordercap.c                |    2 ++
 ui/gtk/packet_list_store.c  |    2 ++
 ui/qt/packet_list_model.cpp |    2 ++
 ui/text_import.c            |    7 ++-----
 5 files changed, 10 insertions(+), 5 deletions(-)