summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2006-07-20 22:25:04 +0000
committerJörg Mayer <jmayer@loplof.de>2006-07-20 22:25:04 +0000
commit1c888f57c9fa9b1437bdfa7810bea84ef55221e5 (patch)
treed786d885473cafe3607db4279716680b62f8e116
parent20093fdaa453322bc97f77c7e5c8534a52f99d97 (diff)
downloadwireshark-1c888f57c9fa9b1437bdfa7810bea84ef55221e5.tar.gz
Daniel Drake <dsd@gentoo.org>:
The barker preamble bit is set when a station associates which does not support short preambles. When it is 0, short preambles are allowed. Me: Add a reference to the spec stating the above. svn path=/trunk/; revision=18777
-rw-r--r--epan/dissectors/packet-ieee80211.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index a08597c2dc..2a42bb5c88 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -1834,7 +1834,9 @@ add_tagged_field (packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int of
g_snprintf (print_buff, SHORT_STR, "%sNon-ERP STAs, %suse protection, %s preambles",
erp_info & 0x01 ? "" : "no ",
erp_info & 0x02 ? "" : "do not ",
- erp_info & 0x04 ? "short or long": "long");
+ /* 802.11g, 7.3.2.13: 1 means "one or more ... STAs
+ * are not short preamble capable" */
+ erp_info & 0x04 ? "long": "short or long");
print_buff[SHORT_STR-1] = '\0';
g_snprintf (out_buff, SHORT_STR,
"ERP info: 0x%x (%s)",erp_info,print_buff);