diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2008-04-14 19:22:19 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2008-04-14 19:22:19 +0000 |
| commit | 03c1c32b5cd05f0ea13bbff39307ca5a947db78d (patch) | |
| tree | 53ba5194383de5a94ab69c8e3a38f5205501fae9 /epan | |
| parent | e1aebe1cb67f8c2452a6168499ede8e33950dc58 (diff) | |
| download | wireshark-03c1c32b5cd05f0ea13bbff39307ca5a947db78d.tar.gz | |
From Philip Frey (bug 2443):
Fixed issues from last patch.
svn path=/trunk/; revision=25018
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-iwarp-ddp-rdmap.c | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-iwarp-mpa.c | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c index 48a329a948..55d0c24a0a 100644 --- a/epan/dissectors/packet-iwarp-ddp-rdmap.c +++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c @@ -372,7 +372,7 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, break; case IWARP_ETYPE_DDP_UNTAGGED: proto_tree_add_item(term_ctrl_field_tree, - hf_iwarp_rdma_term_errcode_ddp_tagged, tvb, + hf_iwarp_rdma_term_errcode_ddp_untagged, tvb, offset, 1, FALSE); offset += 1; break; @@ -814,6 +814,11 @@ proto_register_iwarp_ddp_rdmap(void) "Error Code", "iwarp_rdma.term_errcode", FT_UINT8, BASE_HEX, NULL, 0x0, "Terminate Control Field: Error Code", HFILL} }, + { &hf_iwarp_rdma_term_errcode_llp, { + "Error Code for LLP layer", "iwarp_rdma.term_errcode_llp", + FT_UINT8, BASE_HEX, NULL, 0x0, + "Terminate Control Field: Lower Layer Protocol Error Code", + HFILL} }, { &hf_iwarp_rdma_term_hdrct, { "Header control bits", "iwarp_rdma.term_hdrct", FT_NONE, BASE_NONE, NULL, IWARP_HDRCT, diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index 9a9eb51175..a509486e9c 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -103,7 +103,6 @@ static gint hf_mpa_pd_length = -1; static gint hf_mpa_private_data = -1; static gint hf_mpa_ulpdu_length = -1; -static gint hf_mpa_ulpdu = -1; static gint hf_mpa_pad = -1; static gint hf_mpa_crc = -1; static gint hf_mpa_crc_check = -1; @@ -971,10 +970,6 @@ void proto_register_mpa(void) "ULPDU length", "iwarp_mpa.ulpdulength", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_mpa_ulpdu, { - "ULPDU", "iwarp_mpa.ulpdu", - FT_BYTES, BASE_HEX, NULL, 0x0, - NULL, HFILL } }, { &hf_mpa_pad, { "Padding", "iwarp_mpa.pad", FT_BYTES, BASE_HEX, NULL, 0x0, |