diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-05-02 12:56:52 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2017-05-02 22:01:18 +0000 |
commit | 4a41c2412b1a96bae0843f815d766f12cb8387bb (patch) | |
tree | f7d6b7b72427aec2fab66cd0955395f891da8109 /epan | |
parent | 427c800a9fb41d0c6147b5eac7b82c0e62d4c58f (diff) |
scsi: fix conflicting entry in its value_string
Field 'SPC-2 Opcode' (scsi.spc.opcode) has a conflicting entry in its value_string: 132 is at indices 26 (Receive Copy) and 27 (Receive Copy Results))
Change-Id: I5916bab1bb493226003e86b5a6b693fd4a727499
Reviewed-on: https://code.wireshark.org/review/21458
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-scsi.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-scsi.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 58033f9056..1a6f83d2f0 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -853,7 +853,6 @@ static const value_string scsi_spc_vals[] = { /* 0x7F */ {SCSI_SPC_VARLENCDB , "Variable Length CDB"}, /* 0x83 */ {SCSI_SPC_EXTCOPY , "Extended Copy"}, /* 0x84 */ {SCSI_SPC_RECVCOPY , "Receive Copy"}, - /* 0x84 */ {SCSI_SPC_RCVCOPYRESULTS , "Receive Copy Results"}, /* 0x86 */ {SCSI_SPC_ACCESS_CONTROL_IN , "Access Control In"}, /* 0x87 */ {SCSI_SPC_ACCESS_CONTROL_OUT , "Access Control Out"}, /* 0xA0 */ {SCSI_SPC_REPORTLUNS , "Report LUNs"}, diff --git a/epan/dissectors/packet-scsi.h b/epan/dissectors/packet-scsi.h index 7da0c4b1b8..3caa513be2 100644 --- a/epan/dissectors/packet-scsi.h +++ b/epan/dissectors/packet-scsi.h @@ -125,7 +125,6 @@ typedef struct _scsi_cdb_table_t { #define SCSI_SPC_PERSRESVOUT 0x5F #define SCSI_SPC_PREVMEDREMOVAL 0x1E #define SCSI_SPC_READBUFFER 0x3C -#define SCSI_SPC_RCVCOPYRESULTS 0x84 #define SCSI_SPC_RCVDIAGRESULTS 0x1C #define SCSI_SPC_RELEASE6 0x17 #define SCSI_SPC_RELEASE10 0x57 |