Wireshark-commits: [Wireshark-commits] master 08e5d9a: radiotap: Fix conflict for hf fields

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 20 Nov 2016 13:35:03 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=08e5d9ad7d82f6349aee3d13ad6d11e0a1f42d5e
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

08e5d9a 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>
    

Actions performed:

    from  ded081c   VXLAN: Fix conflict for hf fields
    adds  08e5d9a   radiotap: Fix conflict for hf fields


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