Wireshark-commits: [Wireshark-commits] master c711a11: OPA MAD: fix conflict for hf fields
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 30 May 2016 16:52:31 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c711a1198c787ea4076e82d41ad9f1c29965fc5b
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

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

    OPA MAD: fix conflict for hf fields
    
    'opa.reserved' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
    'opa.mad' exists multiple times with NOT compatible types: FT_NONE and FT_PROTOCOL
    'opa.mad.attributemodifier.a' exists multiple times with NOT compatible types: FT_UINT32 and FT_BOOLEAN
    'opa.mad.attributemodifier.a' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT32
    'opa.mad.attributemodifier.b' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT32
    'opa.mad.attributemodifier.b' exists multiple times with NOT compatible types: FT_UINT32 and FT_BOOLEAN
    'opa.trap.datavalid' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT16
    'opa.trap.datavalid' exists multiple times with NOT compatible types: FT_UINT16 and FT_BOOLEAN
    'opa.switchcongestionsetting.controlmap' exists multiple times with NOT compatible types: FT_UINT32 and FT_NONE
    'opa.aggregate.error' exists multiple times with NOT compatible types: FT_NONE and FT_BOOLEAN
    
    Change-Id: I7971009d19f4916db1c6b0b572595a07bd2072e4
    Reviewed-on: https://code.wireshark.org/review/15620
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  1b920b1   Add nghttp2 folder to ignore pre-commit check
    adds  c711a11   OPA MAD: fix conflict for hf fields


Summary of changes:
 epan/dissectors/packet-opa-mad.c |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)