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

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

Commits:

fee236b by Guy Harris (guy@xxxxxxxxxxxx):

    An NLPID of 0xc0 refers to TRILL.
    
    This will, at least, make it show up as the meaning of a field
    containing an NLPID; whether it's actually used to say "a TRILL packet
    follows" is another matter.
    
    At least partially addresses bug 10382, and fully addresses it if it's
    never actually used to say "a TRILL packet follows".
    
    Change-Id: Ic9dc8ec432532bde692fad3aa9cc97a3109aa634
    Reviewed-on: https://code.wireshark.org/review/3602
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 2cab8766c35b4f1a9b699fbc194aa57e9bef3e8a)
    Reviewed-on: https://code.wireshark.org/review/3627
    

Actions performed:

    from  9337e79   btle advertising header flags (RxAdd/TxAdd) dissected incorrectly
    adds  fee236b   An NLPID of 0xc0 refers to TRILL.


Summary of changes:
 epan/dissectors/packet-osi.c |    1 +
 epan/nlpid.h                 |    1 +
 2 files changed, 2 insertions(+)