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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cc9954b5bd31a5b8e98f8eda86e5e2d38936d379
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.4
Repository: wireshark

Commits:

cc9954b by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    IEEE 1722: rename IEC subdissector from 61883 to iec61883
    
    Otherwise it can collide with the value 61883 typed in a display filter.
    See https://ask.wireshark.org/question/3177 for details.
    
    Change-Id: Ida4872bc4e4b56cb096079a0f0c42e11856e228c
    Reviewed-on: https://code.wireshark.org/review/27754
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit 949bb98319c60a8c72449d4e8d301a321556ebbc)
    Reviewed-on: https://code.wireshark.org/review/27768
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  5aaae4f   Adjust type to fix 2.4 and 2.2 build.
    adds  cc9954b   IEEE 1722: rename IEC subdissector from 61883 to iec61883


Summary of changes:
 epan/dissectors/packet-ieee1722.c | 92 +++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 46 deletions(-)