wlan: fix wrong reported length for reassembled payloads

There is no need to remove the FCS at the end of the reassembled payload since FCS bytes have already been removed from the fragments. Also, the way it was removed in the code was wrong: it set the reported length of the reassembled payload to the reported length of the last fragment only.

Revert "ieee802.11: Make sure we do not include the FCS in the next_tvb."

This reverts commit 094297ec77.
This commit is contained in:
Teyut 2020-12-11 19:03:43 +01:00 committed by AndersBroman
parent ff23fb9f0c
commit efabf1d291
1 changed files with 0 additions and 3 deletions

View File

@ -26877,9 +26877,6 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
next_tvb = process_reassembled_data(tvb, hdr_len, pinfo,
"Reassembled 802.11", fd_head,
&frag_items, NULL, hdr_tree);
/* If we got a next_tvb, but it has an FCS, strip the FCS */
if (next_tvb && has_fcs)
next_tvb = tvb_new_subset_length_caplen(next_tvb, 0, len, reported_len);
} else {
/*
* If this is the first fragment, dissect its contents, otherwise