View | Details | Raw Unified | Return to bug 2408
Collapse All | Expand All

(-)a/src/wave/helper/wave-helper.cc (-6 lines)
 Lines 212-221    Link Here 
212 
            ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST_KNOWN;
 212 
            ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST_KNOWN;
213 
            /* For PCAP file, MPDU Delimiter and Padding should be removed by the MAC Driver */
 213 
            /* For PCAP file, MPDU Delimiter and Padding should be removed by the MAC Driver */
214 
            AmpduSubframeHeader hdr;
 214 
            AmpduSubframeHeader hdr;
215 
            uint32_t extractedLength;
216 
            p->RemoveHeader (hdr);
 215 
            p->RemoveHeader (hdr);
217 
            extractedLength = hdr.GetLength ();
218 
            p = p->CreateFragment (0, static_cast<uint32_t> (extractedLength));
219 
            if (aMpdu.type == LAST_MPDU_IN_AGGREGATE || (hdr.GetEof () == true && hdr.GetLength () > 0))
 216 
            if (aMpdu.type == LAST_MPDU_IN_AGGREGATE || (hdr.GetEof () == true && hdr.GetLength () > 0))
220 
              {
 217 
              {
221 
                ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST;
 218 
                ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST;
 Lines 409-418    Link Here 
409 
            ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST_KNOWN;
 406 
            ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST_KNOWN;
410 
            /* For PCAP file, MPDU Delimiter and Padding should be removed by the MAC Driver */
 407 
            /* For PCAP file, MPDU Delimiter and Padding should be removed by the MAC Driver */
411 
            AmpduSubframeHeader hdr;
 408 
            AmpduSubframeHeader hdr;
412 
            uint32_t extractedLength;
413 
            p->RemoveHeader (hdr);
 409 
            p->RemoveHeader (hdr);
414 
            extractedLength = hdr.GetLength ();
415 
            p = p->CreateFragment (0, static_cast<uint32_t> (extractedLength));
416 
            if (aMpdu.type == LAST_MPDU_IN_AGGREGATE || (hdr.GetEof () == true && hdr.GetLength () > 0))
 410 
            if (aMpdu.type == LAST_MPDU_IN_AGGREGATE || (hdr.GetEof () == true && hdr.GetLength () > 0))
417 
              {
 411 
              {
418 
                ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST;
 412 
                ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST;
(-)a/src/wifi/helper/yans-wifi-helper.cc (-6 lines)
 Lines 374-383    Link Here 
374 
            ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST_KNOWN;
 374 
            ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST_KNOWN;
375 
            /* For PCAP file, MPDU Delimiter and Padding should be removed by the MAC Driver */
 375 
            /* For PCAP file, MPDU Delimiter and Padding should be removed by the MAC Driver */
376 
            AmpduSubframeHeader hdr;
 376 
            AmpduSubframeHeader hdr;
377 
            uint32_t extractedLength;
378 
            p->RemoveHeader (hdr);
 377 
            p->RemoveHeader (hdr);
379 
            extractedLength = hdr.GetLength ();
380 
            p = p->CreateFragment (0, static_cast<uint32_t> (extractedLength));
381 
            if (aMpdu.type == LAST_MPDU_IN_AGGREGATE || (hdr.GetEof () == true && hdr.GetLength () > 0))
 378 
            if (aMpdu.type == LAST_MPDU_IN_AGGREGATE || (hdr.GetEof () == true && hdr.GetLength () > 0))
382 
              {
 379 
              {
383 
                ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST;
 380 
                ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST;
 Lines 571-580    Link Here 
571 
            ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST_KNOWN;
 568 
            ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST_KNOWN;
572 
            /* For PCAP file, MPDU Delimiter and Padding should be removed by the MAC Driver */
 569 
            /* For PCAP file, MPDU Delimiter and Padding should be removed by the MAC Driver */
573 
            AmpduSubframeHeader hdr;
 570 
            AmpduSubframeHeader hdr;
574 
            uint32_t extractedLength;
575 
            p->RemoveHeader (hdr);
 571 
            p->RemoveHeader (hdr);
576 
            extractedLength = hdr.GetLength ();
577 
            p = p->CreateFragment (0, static_cast<uint32_t> (extractedLength));
578 
            if (aMpdu.type == LAST_MPDU_IN_AGGREGATE || (hdr.GetEof () == true && hdr.GetLength () > 0))
 572 
            if (aMpdu.type == LAST_MPDU_IN_AGGREGATE || (hdr.GetEof () == true && hdr.GetLength () > 0))
579 
              {
 573 
              {
580 
                ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST;
 574 
                ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST;

Return to bug 2408