Wireshark-commits: [Wireshark-commits] master dcf01e8: ospf: fix conlict

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 13 Sep 2018 03:55:17 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=dcf01e817e4ceb22fb650b2fe1a21edec6a8f9fe
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

dcf01e8 by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    ospf: fix conlict
    
    'ospf.mpls.pri' exists multiple times with NOT compatible types: FT_FLOAT and FT_UINT8
    
    Change-Id: Iea0b662d0a9ff4a7ea7363ef4ef049d11d5a5dca
    Reviewed-on: https://code.wireshark.org/review/29608
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  9a40000   AT: Add CSUPI command
     add  dcf01e8   ospf: fix conlict


Summary of changes:
 epan/dissectors/packet-ospf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)