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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9fcd6e486cc47377ee37bca6c4dead27230197c6
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.4
Repository: wireshark

Commits:

9fcd6e4 by Guy Harris (guy@xxxxxxxxxxxx):

    Sort cases in pcap_get_phdr_size(), add a missing one for WTAP_ENCAP_NFC_LLCP.
    
    Sort the cases to match the order in other routines.
    
    That turned up a missing case for WTAP_ENCAP_NFC_LLCP, so add it.
    
    Change-Id: I500731322ae93c6d2efc368f16cf468f589910f3
    Reviewed-on: https://code.wireshark.org/review/29858
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 0a19ec761d68b4a52a4bbfe994503d3d09dbd245)
    Reviewed-on: https://code.wireshark.org/review/29860
    

Actions performed:

    from  4b78f64   PCP: Add padding for option
     add  9fcd6e4   Sort cases in pcap_get_phdr_size(), add a missing one for WTAP_ENCAP_NFC_LLCP.


Summary of changes:
 wiretap/pcap-common.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)