diff -r 8ab3a9c50c57 -r 96e983e7cd5d src/wifi/model/mac-low.cc --- a/src/wifi/model/mac-low.cc Thu Dec 04 12:49:50 2014 +0100 +++ b/src/wifi/model/mac-low.cc Wed Dec 03 14:47:28 2014 -0800 @@ -805,7 +805,7 @@ (*i).second.UpdateWithBlockAckReq (blockAckReq.GetStartingSequence ()); NS_ASSERT (m_sendAckEvent.IsExpired ()); - /* See section 11.5.3 in IEEE802.11 for mean of this timer */ + /* See section 11.5.3 in IEEE 802.11 for mean of this timer */ ResetBlockAckInactivityTimerIfNeeded (it->second.first); if ((*it).second.first.IsImmediateBlockAck ()) { @@ -843,7 +843,7 @@ if (hdr.IsQosData () && StoreMpduIfNeeded (packet, hdr)) { - /* From section 9.10.4 in IEEE802.11: + /* From section 9.10.4 in IEEE 802.11: Upon the receipt of a QoS data frame from the originator for which the Block Ack agreement exists, the recipient shall buffer the MSDU regardless of the value of the Ack Policy subfield within the @@ -865,7 +865,7 @@ else if (hdr.IsQosBlockAck ()) { AgreementsI it = m_bAckAgreements.find (std::make_pair (hdr.GetAddr2 (), hdr.GetQosTid ())); - /* See section 11.5.3 in IEEE802.11 for mean of this timer */ + /* See section 11.5.3 in IEEE 802.11 for mean of this timer */ ResetBlockAckInactivityTimerIfNeeded (it->second.first); } return; @@ -875,7 +875,7 @@ /* This happens if a packet with ack policy Block Ack is received and a block ack agreement for that packet doesn't exist. - From section 11.5.3 in IEEE802.11e: + From section 11.5.3 in IEEE 802.11e: When a recipient does not have an active Block ack for a TID, but receives data MPDUs with the Ack Policy subfield set to Block Ack, it shall discard them and shall send a DELBA frame using the normal access @@ -991,7 +991,7 @@ * For immediate BlockAck we should transmit the frame with the same WifiMode * as the BlockAckReq. * - * from section 9.6 in IEEE802.11e: + * from section 9.6 in IEEE 802.11e: * The BlockAck control frame shall be sent at the same rate and modulation class as * the BlockAckReq frame if it is sent in response to a BlockAckReq frame. */ @@ -1766,7 +1766,7 @@ tag.Set (dataSnr); packet->AddPacketTag (tag); - //since ACK is a control response it can't have Fomat =GF + //since ACK is a control response it can't have format GF WifiPreamble preamble; if (ackTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT) preamble= WIFI_PREAMBLE_HT_MF; @@ -2056,7 +2056,7 @@ (*i).second.FillBlockAckBitmap (&blockAck); /* All packets with smaller sequence than starting sequence control must be passed up to Wifimac - * See 9.10.3 in IEEE8022.11e standard. + * See 9.10.3 in IEEE 802.11e standard. */ RxCompleteBufferedPacketsWithSmallerSequence (reqHdr.GetStartingSequence (), originator, tid); RxCompleteBufferedPacketsUntilFirstLost (originator, tid);