Wireshark-commits: [Wireshark-commits] master-2.2 855bd75: radiotap: Fix conflict for hf fields

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: Sun, 20 Nov 2016 13:36:01 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=855bd75d26611e4cd7ac9d46159d04fba730a428
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

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

    radiotap: Fix conflict for hf fields
    
    'radiotap.present.flags' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT32
    
    Change-Id: Ib53eb43c2103b24bd02bd41fd20030b7e7ae321b
    Reviewed-on: https://code.wireshark.org/review/18886
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 08e5d9ad7d82f6349aee3d13ad6d11e0a1f42d5e)
    Reviewed-on: https://code.wireshark.org/review/18893
    

Actions performed:

    from  db7f6ec   tcp: fix "calculated checksum" tree item for bad checksums
    adds  855bd75   radiotap: Fix conflict for hf fields


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