aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ieee80211.c
diff options
context:
space:
mode:
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2008-12-18 20:19:49 +0000
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2008-12-18 20:19:49 +0000
commit4483eab426940375800723390c11185f49a13b10 (patch)
tree332faa3857357eb750d858d3fb9efb168f4e5355 /epan/dissectors/packet-ieee80211.c
parent8153d2b545177e4086795a90f1af87e642417eb3 (diff)
Update calls to proto_tree_add_bytes_format to reflect r27047.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27053 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
-rw-r--r--epan/dissectors/packet-ieee80211.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 2ac5ff545d..150a6b6fca 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -3021,7 +3021,7 @@ add_fixed_field(proto_tree * tree, tvbuff_t * tvb, int offset, int lfcode)
oui = tvb_get_ntoh24(tvb, offset);
tag_data_ptr = tvb_get_ptr(tvb, offset, 3);
proto_tree_add_bytes_format (action_tree, tag_oui, tvb, offset, 3,
- tag_data_ptr, "Vendor: %s", get_manuf_name(tag_data_ptr));
+ "Vendor: %s", get_manuf_name(tag_data_ptr));
offset+=3;
switch(oui){
case OUI_MARVELL:
@@ -3517,7 +3517,6 @@ dissect_vendor_ie_aironet(proto_item * aironet_item, proto_tree * ietree,
byte2 = tvb_get_guint8(tvb, offset + 1);
txop = tvb_get_letohs(tvb, offset + 2);
proto_tree_add_bytes_format(ietree, hf_aironet_ie_qos_val, tvb, offset, 4,
- tvb_get_ptr(tvb, offset, 4),
"CCX QoS Parameters??: ACI %u (%s), Admission Control %sMandatory, AIFSN %u, ECWmin %u, ECWmax %u, TXOP %u",
(byte1 & 0x60) >> 5, wme_acs[(byte1 & 0x60) >> 5],
(byte1 & 0x10) ? "" : "not ", byte1 & 0x0f,
@@ -4977,7 +4976,7 @@ add_tagged_field (packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int of
tag_tvb = tvb_new_subset(tvb, offset + 2, tag_len, tag_len);
tag_data_ptr = tvb_get_ptr(tag_tvb, 0, 3);
proto_tree_add_bytes_format (tree, tag_oui, tvb, offset + 2, 3,
- tag_data_ptr, "Vendor: %s", get_manuf_name(tag_data_ptr));
+ "Vendor: %s", get_manuf_name(tag_data_ptr));
proto_item_append_text(ti, ": %s", get_manuf_name(tag_data_ptr));
#define WPAWME_OUI 0x0050F2