Wireshark-commits: [Wireshark-commits] master f82c46c: trmac: fix 'trmac.group_address' exists mult

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: Fri, 11 Mar 2016 14:16:21 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f82c46c795419052208a2480f5625bd560e493e2
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

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

    trmac: fix 'trmac.group_address' exists multiple times with NOT compatible types: FT_ETHER and FT_UINT32
    
    Change-Id: I5289022752513e84783a8c65ab8f2327a7023597
    Reviewed-on: https://code.wireshark.org/review/14414
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  4c6a186   SCSI: Fix conflict for hf fields
    adds  f82c46c   trmac: fix 'trmac.group_address' exists multiple times with NOT compatible types: FT_ETHER and FT_UINT32


Summary of changes:
 epan/dissectors/packet-trmac.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)