aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-03-24 20:15:21 -0700
committerGuy Harris <guy@alum.mit.edu>2014-03-25 03:20:12 +0000
commite4756ccacf47234a766ab5e10d17bd9c5203061d (patch)
tree07db086268a9abe07a54631b794ad86e793004c5
parent4038fa9b0a17e21708e6161abca9b75f4615f926 (diff)
Comment cleanups.
Remove some more 802.11i references, and replace a reference to the "WEP" bit with a reference to the "Protected" bit. Change-Id: I77b50af2b34e2bdc4c21af29b54627ed19219090 Reviewed-on: https://code.wireshark.org/review/821 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--epan/dissectors/packet-ieee80211.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index daa3888fd8..c94edae07d 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -137,7 +137,8 @@ static gboolean wlan_check_fcs = FALSE;
/* Ignore vendor-specific HT elements */
static gboolean wlan_ignore_draft_ht = FALSE;
-/* Ignore the WEP bit; assume packet is decrypted */
+/* Ignore the Protection bit; assume packet is decrypted */
+/* (The term "WEP" is historical.) */
#define WLAN_IGNORE_WEP_NO 0
#define WLAN_IGNORE_WEP_WO_IV 1
#define WLAN_IGNORE_WEP_W_IV 2
@@ -17744,7 +17745,7 @@ dissect_wlan_rsna_eapol_wpa_or_rsn_key(tvbuff_t *tvb, packet_info *pinfo, proto_
guint8 counter;
/*
- * 802.11i.
+ * RSNA key descriptors.
*/
keyinfo = tvb_get_ntohs(tvb, offset);
if (keyinfo & KEY_INFO_REQUEST_MASK) {
@@ -25880,7 +25881,6 @@ proto_register_ieee80211 (void)
&wlan_check_fcs);
/* Davide Schiera (2006-11-26): changed "WEP bit" in "Protection bit" */
- /* (according to the document IEEE Std 802.11i-2004) */
prefs_register_enum_preference(wlan_module, "ignore_wep",
"Ignore the Protection bit",
"Some 802.11 cards leave the Protection bit set even though the packet is decrypted, "