diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2012-09-11 03:30:04 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2012-09-11 03:30:04 +0000 |
| commit | 6c84cbde983388830297c48a637c13806cf02cc7 (patch) | |
| tree | b07bb6ff704b8102ba68204ce75681b18c777df1 /epan/dissectors/packet-scsi-sbc.c | |
| parent | dc60423e87debcde36e2830eda15a5f53fbfc0e1 (diff) | |
SCSI: SBC: READCAPACITY16 no longer have PMI or LBA in the request in modern versions of the standard
svn path=/trunk/; revision=44865
Diffstat (limited to 'epan/dissectors/packet-scsi-sbc.c')
| -rw-r--r-- | epan/dissectors/packet-scsi-sbc.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c index 54c2875788..db2d036507 100644 --- a/epan/dissectors/packet-scsi-sbc.c +++ b/epan/dissectors/packet-scsi-sbc.c @@ -1284,10 +1284,6 @@ dissect_sbc_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_, guint32 block_len; guint64 len, tot_len; const char *un; - static const int *pmi_fields[] = { - &hf_scsi_sbc_pmi, - NULL - }; if (!tree) return; @@ -1305,18 +1301,10 @@ dissect_sbc_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_, val_to_str (service_action, service_action_vals, "Unknown (0x%02x)")); - offset++; - - proto_tree_add_text (tree, tvb, offset, 8, - "Logical Block Address: %" G_GINT64_MODIFIER "u", - tvb_get_ntoh64 (tvb, offset)); - offset += 8; + offset += 9; proto_tree_add_item (tree, hf_scsi_sbc_alloclen32, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; - - proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_pmi_flags, ett_scsi_pmi, pmi_fields, ENC_BIG_ENDIAN); - offset++; + offset += 5; proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_control, ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); |