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

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

Commits:

35a7062 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/3628
    

Actions performed:

    from  14ce593   Regenerate manuf with the updated wka.tmpl.
    adds  35a7062   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(+)