aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ieee80211.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2002-04-17 10:07:57 +0000
committerGuy Harris <guy@alum.mit.edu>2002-04-17 10:07:57 +0000
commitb2c11b5e13248b1c98ee5104eab411e842911e19 (patch)
tree6ef7393fddfc0a7e6c22ee5a8e738336ba71899e /packet-ieee80211.c
parent332340c8686257f1253c918c86badd3fd9c5f5ba (diff)
downloadwireshark-b2c11b5e13248b1c98ee5104eab411e842911e19.tar.gz
wireshark-b2c11b5e13248b1c98ee5104eab411e842911e19.tar.bz2
wireshark-b2c11b5e13248b1c98ee5104eab411e842911e19.zip
Don't try to reassemble short frames - but do still pass them through at
least some of the reassembly mechanism, so we can deal with both bogus and real last fragment (display the bogus ones as unfragmented frames, treat the real ones as fragments). svn path=/trunk/; revision=5186
Diffstat (limited to 'packet-ieee80211.c')
-rw-r--r--packet-ieee80211.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/packet-ieee80211.c b/packet-ieee80211.c
index bf2e6dd192..40c091656f 100644
--- a/packet-ieee80211.c
+++ b/packet-ieee80211.c
@@ -3,7 +3,7 @@
* Copyright 2000, Axis Communications AB
* Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
*
- * $Id: packet-ieee80211.c,v 1.57 2002/04/17 09:34:09 guy Exp $
+ * $Id: packet-ieee80211.c,v 1.58 2002/04/17 10:07:56 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1631,8 +1631,6 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
* (This could get some false positives if we really *did* only
* capture the last fragment of a fragmented packet, but that's
* life.)
- *
- * XXX - what about short frames?
*/
save_fragmented = pinfo->fragmented;
if (wlan_defragment && (more_frags || frag_number != 0)) {