diff --git a/src/wifi/model/he-capabilities.h b/src/wifi/model/he-capabilities.h index f8941cdfd..2e43ccd14 100644 --- a/src/wifi/model/he-capabilities.h +++ b/src/wifi/model/he-capabilities.h @@ -63,17 +63,17 @@ public: uint8_t DeserializeInformationField (Buffer::Iterator start, uint8_t length); /** - * Set the HE MAC Capabilties Info field in the HE Capabilities information element. + * Set the HE MAC Capabilities Info field in the HE Capabilities information element. * - * \param ctrl1 the HE MAC Capabilties Info field 1 in the HE Capabilities information element - * \param ctrl2 the HE MAC Capabilties Info field 2 in the HE Capabilities information element + * \param ctrl1 the HE MAC Capabilities Info field 1 in the HE Capabilities information element + * \param ctrl2 the HE MAC Capabilities Info field 2 in the HE Capabilities information element */ void SetHeMacCapabilitiesInfo (uint32_t ctrl1, uint8_t ctrl2); /** - * Set the HE PHY Capabilties Info field in the HE Capabilities information element. + * Set the HE PHY Capabilities Info field in the HE Capabilities information element. * - * \param ctrl1 the HE PHY Capabilties Info field 1 in the HE Capabilities information element - * \param ctrl2 the HE PHY Capabilties Info field 2 in the HE Capabilities information element + * \param ctrl1 the HE PHY Capabilities Info field 1 in the HE Capabilities information element + * \param ctrl2 the HE PHY Capabilities Info field 2 in the HE Capabilities information element */ void SetHePhyCapabilitiesInfo (uint64_t ctrl1, uint8_t ctrl2); /** @@ -84,27 +84,27 @@ public: void SetSupportedMcsAndNss (uint16_t ctrl); /** - * Return the 4 first octets of the HE MAC Capabilties Info field in the HE Capabilities information element. + * Return the 4 first octets of the HE MAC Capabilities Info field in the HE Capabilities information element. * - * \return the 4 first octets of the HE MAC Capabilties Info field in the HE Capabilities information element + * \return the 4 first octets of the HE MAC Capabilities Info field in the HE Capabilities information element */ uint32_t GetHeMacCapabilitiesInfo1 () const; /** - * Return the last octet of the HE MAC Capabilties Info field in the HE Capabilities information element. + * Return the last octet of the HE MAC Capabilities Info field in the HE Capabilities information element. * - * \return the last octet of the HE MAC Capabilties Info field in the HE Capabilities information element + * \return the last octet of the HE MAC Capabilities Info field in the HE Capabilities information element */ uint8_t GetHeMacCapabilitiesInfo2 () const; /** - * Return the 8 first octets of the HE PHY Capabilties Info field in the HE Capabilities information element. + * Return the 8 first octets of the HE PHY Capabilities Info field in the HE Capabilities information element. * - * \return the 8 first octets of the HE PHY Capabilties Info field in the HE Capabilities information element + * \return the 8 first octets of the HE PHY Capabilities Info field in the HE Capabilities information element */ uint64_t GetHePhyCapabilitiesInfo1 () const; /** - * Return the last octet of the HE PHY Capabilties Info field in the HE Capabilities information element. + * Return the last octet of the HE PHY Capabilities Info field in the HE Capabilities information element. * - * \return the last octet of the HE PHY Capabilties Info field in the HE Capabilities information element + * \return the last octet of the HE PHY Capabilities Info field in the HE Capabilities information element */ uint8_t GetHePhyCapabilitiesInfo2 () const; /** diff --git a/src/wifi/model/ht-capabilities.h b/src/wifi/model/ht-capabilities.h index bc8e18767..229599fef 100644 --- a/src/wifi/model/ht-capabilities.h +++ b/src/wifi/model/ht-capabilities.h @@ -52,9 +52,9 @@ public: void SetHtSupported (uint8_t htsupported); /** - * Set the HT Capabilties Info field in the HT Capabilities information element. + * Set the HT Capabilities Info field in the HT Capabilities information element. * - * \param ctrl the HT Capabilties Info field in the HT Capabilities information element + * \param ctrl the HT Capabilities Info field in the HT Capabilities information element */ void SetHtCapabilitiesInfo (uint16_t ctrl); /** @@ -71,21 +71,21 @@ public: */ void SetSupportedMcsSet (uint64_t ctrl1, uint64_t ctrl2); /** - * Set the Extended HT Capabilties field in the HT Capabilities information element. + * Set the Extended HT Capabilities field in the HT Capabilities information element. * - * \param ctrl the Extended HT Capabilties field in the HT Capabilities information element + * \param ctrl the Extended HT Capabilities field in the HT Capabilities information element */ void SetExtendedHtCapabilities (uint16_t ctrl); /** - * Set the Transmit Beamforming (TxBF) Capabilties field in the HT Capabilities information element. + * Set the Transmit Beamforming (TxBF) Capabilities field in the HT Capabilities information element. * - * \param ctrl the Transmit Beamforming (TxBF) Capabilties field in the HT Capabilities information element + * \param ctrl the Transmit Beamforming (TxBF) Capabilities field in the HT Capabilities information element */ void SetTxBfCapabilities (uint32_t ctrl); /** - * Set the the Antenna Selection (ASEL) Capabilties field in the HT Capabilities information element. + * Set the the Antenna Selection (ASEL) Capabilities field in the HT Capabilities information element. * - * \param ctrl the Antenna Selection (ASEL) Capabilties field in the HT Capabilities information element + * \param ctrl the Antenna Selection (ASEL) Capabilities field in the HT Capabilities information element */ void SetAntennaSelectionCapabilities (uint8_t ctrl); @@ -177,9 +177,9 @@ public: void SetTxUnequalModulation (uint8_t txunequalmodulation); /** - * Return the HT Capabilties Info field in the HT Capabilities information element. + * Return the HT Capabilities Info field in the HT Capabilities information element. * - * \return the HT Capabilties Info field in the HT Capabilities information element + * \return the HT Capabilities Info field in the HT Capabilities information element */ uint16_t GetHtCapabilitiesInfo (void) const; /** @@ -201,21 +201,21 @@ public: */ uint64_t GetSupportedMcsSet2 (void) const; /** - * Return the Extended HT Capabilties field in the HT Capabilities information element. + * Return the Extended HT Capabilities field in the HT Capabilities information element. * - * \return the Extended HT Capabilties field in the HT Capabilities information element + * \return the Extended HT Capabilities field in the HT Capabilities information element */ uint16_t GetExtendedHtCapabilities (void) const; /** - * Return the Transmit Beamforming (TxBF) Capabilties field in the HT Capabilities information element. + * Return the Transmit Beamforming (TxBF) Capabilities field in the HT Capabilities information element. * - * \return the Transmit Beamforming (TxBF) Capabilties field in the HT Capabilities information element + * \return the Transmit Beamforming (TxBF) Capabilities field in the HT Capabilities information element */ uint32_t GetTxBfCapabilities (void) const; /** - * Return the Antenna Selection (ASEL) Capabilties field in the HT Capabilities information element. + * Return the Antenna Selection (ASEL) Capabilities field in the HT Capabilities information element. * - * \return the Antenna Selection (ASEL) Capabilties field in the HT Capabilities information element + * \return the Antenna Selection (ASEL) Capabilities field in the HT Capabilities information element */ uint8_t GetAntennaSelectionCapabilities (void) const; @@ -307,7 +307,7 @@ public: private: - //HT Capabilties Info field + //HT Capabilities Info field uint8_t m_ldpc; ///< LDPC uint8_t m_supportedChannelWidth; ///< supported channel width uint8_t m_smPowerSave; ///< SM power save @@ -339,7 +339,7 @@ private: uint32_t m_reservedMcsSet3; ///< reserved MCS set 3 uint8_t m_rxMcsBitmask[MAX_SUPPORTED_MCS]; ///< receive MCS bitmask - //HT Extended Capabilties field + //HT Extended Capabilities field uint8_t m_pco; ///< PCO uint8_t m_pcoTransitionTime; ///< PCO trnsition time uint8_t m_reservedExtendedCapabilities; ///< reserved extended capabilities diff --git a/src/wifi/model/mac-low.cc b/src/wifi/model/mac-low.cc index f8ba84772..fffa146b2 100644 --- a/src/wifi/model/mac-low.cc +++ b/src/wifi/model/mac-low.cc @@ -2633,7 +2633,7 @@ MacLow::AggregateToAmpdu (Ptr packet, const WifiMacHeader hdr) else if (hdr.IsBlockAckReq ()) { blockAckSize = static_cast (packet->GetSize () + hdr.GetSize () + WIFI_MAC_FCS_LENGTH); - qosPolicy = 3; //if the last subrame is block ack req then set ack policy of all frames to blockack + qosPolicy = 3; //if the last subframe is block ack req then set ack policy of all frames to blockack packet->PeekHeader (blockAckReq); startingSequenceNumber = blockAckReq.GetStartingSequence (); } diff --git a/src/wifi/model/vht-capabilities.h b/src/wifi/model/vht-capabilities.h index ce5c4bf86..718f08a91 100644 --- a/src/wifi/model/vht-capabilities.h +++ b/src/wifi/model/vht-capabilities.h @@ -70,9 +70,9 @@ public: uint8_t DeserializeInformationField (Buffer::Iterator start, uint8_t length); /** - * Set the VHT Capabilties Info field in the VHT Capabilities information element. + * Set the VHT Capabilities Info field in the VHT Capabilities information element. * - * \param ctrl the VHT Capabilties Info field in the VHT Capabilities information element + * \param ctrl the VHT Capabilities Info field in the VHT Capabilities information element */ void SetVhtCapabilitiesInfo (uint32_t ctrl); /** @@ -83,9 +83,9 @@ public: void SetSupportedMcsAndNssSet (uint64_t ctrl); /** - * Return the VHT Capabilties Info field in the VHT Capabilities information element. + * Return the VHT Capabilities Info field in the VHT Capabilities information element. * - * \return the VHT Capabilties Info field in the VHT Capabilities information element + * \return the VHT Capabilities Info field in the VHT Capabilities information element */ uint32_t GetVhtCapabilitiesInfo () const; /**