URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4c6a18688e940dc3e18e75a9bcc34f77572e7dca
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
4c6a186 by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):
SCSI: Fix conflict for hf fields
'scsi.blockdescs.no_of_blocks' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'scsi.naa.vendor_specific' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT32
Change-Id: Iaa512c02b99f0a103bb5015e92d900dae2932843
Reviewed-on: https://code.wireshark.org/review/14418
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 2746cf6 sigcomp: fix 'sigcomp.decompression_failure' exists multiple times with NOT compatible types: FT_NONE and FT_UINT32
adds 4c6a186 SCSI: Fix conflict for hf fields
Summary of changes:
epan/dissectors/packet-scsi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)