diff -r 99300a162f1c -r 9f4ae69f12b7 src/wifi/model/msdu-standard-aggregator.h --- a/src/wifi/model/msdu-standard-aggregator.h Tue Jun 16 13:13:06 2015 -0700 +++ b/src/wifi/model/msdu-standard-aggregator.h Sun Jun 21 00:23:45 2015 +0200 @@ -17,6 +17,7 @@ * * Author: Mirko Banchi */ + #ifndef MSDU_STANDARD_AGGREGATOR_H #define MSDU_STANDARD_AGGREGATOR_H @@ -40,7 +41,9 @@ * \param aggregatedPacket Packet that will contain packet, if aggregation is possible, * \param src Source address of packet. * \param dest Destination address of packet. - * \return true if the packet can be aggregated, false otherwise + * + * \return true if the packet can be aggregated, + * false otherwise * * This method performs an MSDU aggregation. * Returns true if packet can be aggregated to aggregatedPacket, false otherwise. @@ -48,12 +51,13 @@ virtual bool Aggregate (Ptr packet, Ptr aggregatedPacket, Mac48Address src, Mac48Address dest); private: - /** + /** * Calculates how much padding must be added to the end of aggregated packet, * after that a new packet is added. * Each A-MSDU subframe is padded so that its length is multiple of 4 octets. * * \param packet + * * \return the number of octets required for padding */ uint32_t CalculatePadding (Ptr packet); @@ -61,6 +65,6 @@ uint32_t m_maxAmsduLength; }; -} // namespace ns3 +} //namespace ns3 #endif /* MSDU_STANDARD_AGGREGATOR_H */