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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=dec1b552c60dde4c906a2d27bd38fa178d22b89e
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

dec1b55 by Anthony Coddington (anthony.coddington@xxxxxxxxxx):

    ERF: Fix Ethernet FCS detection and remove preference
    
    Use eth_maybefcs instead of eth_withoutfcs.
    ERF_TYPE_ETH records almost always have FCS, but using maybe means the "Assume
    packets have FCS" is respected.
    Mark the erf_ethfcs preference as obsolete. It was being ignored.
    This was broken by Change 3670 which changed the ERF dissector to use
    a dissector table.
    
    Change-Id: Ie0043441511c4a4fa5974747af31f88105a974bf
    Reviewed-on: https://code.wireshark.org/review/15389
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  7c0edd8   Separate "Ethernet in capture file" and "Ethernet maybe with FCS" dissectors.
    adds  dec1b55   ERF: Fix Ethernet FCS detection and remove preference


Summary of changes:
 epan/dissectors/packet-erf.c |   11 +++++------
 epan/dissectors/packet-eth.c |    5 +++--
 2 files changed, 8 insertions(+), 8 deletions(-)