summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2009-05-15 06:51:58 +0000
committerJörg Mayer <jmayer@loplof.de>2009-05-15 06:51:58 +0000
commitced75697274de976426d3cc4532b6311c7b90fb1 (patch)
treec699c6f2d1af697220b171103df1c08a9b09ad1f /epan
parent7bbfa31856a8749d366fdc8bfd27b460deea6488 (diff)
downloadwireshark-ced75697274de976426d3cc4532b6311c7b90fb1.tar.gz
Rename an CCX IE
svn path=/trunk/; revision=28370
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ieee80211.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 6295f631f0..c6ec062690 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -508,9 +508,10 @@ int add_mimo_compressed_beamforming_feedback_report (proto_tree *tree, tvbuff_t
#define TAG_OVERLAP_BSS_SCAN_PAR 0x49 /* IEEE P802.11n/D6.0 */
#define TAG_EXTENDED_CAPABILITIES 0X7F /* IEEE Stc 802.11n/D1.10/D2.0 */
#define TAG_AGERE_PROPRIETARY 0x80
-#define TAG_CISCO_UNKNOWN_1 0x85 /* Cisco Compatible eXtensions */
-#define TAG_CISCO_UNKNOWN_2 0x88 /* Cisco Compatible eXtensions? */
-#define TAG_CISCO_UNKNOWN_3 0x95 /* Cisco Compatible eXtensions */
+#define TAG_CISCO_CCX1_CKIP 0x85 /* Cisco Compatible eXtensions */
+#define TAG_CISCO_UNKNOWN_88 0x88 /* Cisco Compatible eXtensions? */
+#define TAG_CISCO_UNKNOWN_95 0x95 /* Cisco Compatible eXtensions */
+#define TAG_CISCO_UNKNOWN_96 0x96 /* Cisco Compatible eXtensions */
#define TAG_VENDOR_SPECIFIC_IE 0xDD
#define TAG_SYMBOL_PROPRIETARY 0xAD
#if 0 /* Not yet assigned tag numbers by ANA */
@@ -4406,9 +4407,10 @@ static const value_string tag_num_vals[] = {
{ TAG_ERP_INFO_OLD, "ERP Information" },
{ TAG_RSN_IE, "RSN Information" },
{ TAG_EXT_SUPP_RATES, "Extended Supported Rates" },
- { TAG_CISCO_UNKNOWN_1, "Cisco Unknown 1 + Device Name" },
- { TAG_CISCO_UNKNOWN_2, "Cisco Unknown 2" },
- { TAG_CISCO_UNKNOWN_3, "Cisco Unknown 3" },
+ { TAG_CISCO_CCX1_CKIP, "Cisco CCX1 CKIP + Device Name" },
+ { TAG_CISCO_UNKNOWN_88, "Cisco Unknown 88" },
+ { TAG_CISCO_UNKNOWN_95, "Cisco Unknown 95" },
+ { TAG_CISCO_UNKNOWN_96, "Cisco Unknown 96" },
{ TAG_VENDOR_SPECIFIC_IE, "Vendor Specific" },
{ TAG_SYMBOL_PROPRIETARY, "Symbol Proprietary"},
{ TAG_AGERE_PROPRIETARY, "Agere Proprietary"},
@@ -4945,7 +4947,7 @@ add_tagged_field (packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int of
}
break;
- case TAG_CISCO_UNKNOWN_1:
+ case TAG_CISCO_CCX1_CKIP:
/* From WCS manual:
* If Aironet IE support is enabled, the access point sends an Aironet
* IE 0x85 (which contains the access point name, load, number of