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

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

Commits:

475032c by Uli Heilmeier (uh@xxxxxxxxxxxx):

    OUI: Add 0x000142 Cisco to oui_vals
    
    The LLDP dissector is using oui_vals to resolve OUIs for hf_org_spc_oui.
    Therefore it currently shows "Unknown" for OUI 0x000142.
    
    Change-Id: Ie5f926a183dc42a957fb05c5a38d677a2064ff28
    Reviewed-on: https://code.wireshark.org/review/17036
    Petri-Dish: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 5ae7076b3ead0d3c7ae3ad4d9d05d9a89930d848)
    Reviewed-on: https://code.wireshark.org/review/17038
    

Actions performed:

    from  3452c7b   IEEE 802.11: fix dissection of PLMN Information IE
    adds  475032c   OUI: Add 0x000142 Cisco to oui_vals


Summary of changes:
 epan/oui.c |    1 +
 1 file changed, 1 insertion(+)