Wireshark-commits: [Wireshark-commits] master-2.6 3b7c8ab: Add entries for two WTAP_ENCAP_ types, a

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 20 May 2018 21:31:14 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3b7c8ab526c0946d976b76fd5f96b2a9c141a481
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

3b7c8ab by Guy Harris (guy@xxxxxxxxxxxx):

    Add entries for two WTAP_ENCAP_ types, and clean up another entry.
    
    We didn't have entries for WTAP_ENCAP_JUNIPER_ST or
    WTAP_ENCAP_ETHERNET_MPACKET; add them.
    
    The entry for WTAP_ENCAP_DOCSIS31_XRA31 just called it "DOCSIS31 XRA31",
    not "DOCSIS with Excentis XRA pseudo-header", which is a more complete
    description.  (That field is supposed to be a descriptive word or
    phrase, not just a short protocol name.)
    
    Change-Id: Ib2b30fccce2339a12d216466831a1786e14178b7
    Reviewed-on: https://code.wireshark.org/review/27671
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 040b70364d73c4244e4010c22adb623385502abd)
    Reviewed-on: https://code.wireshark.org/review/27672
    

Actions performed:

    from  405dd27   [Automatic update for 2018-05-20]
    adds  3b7c8ab   Add entries for two WTAP_ENCAP_ types, and clean up another entry.


Summary of changes:
 wiretap/wtap.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)