From 4d899db6d28b48f0ac7e6236feb9f4c27ec87f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Tue, 5 May 2015 00:32:07 +0200 Subject: [PATCH] Update wifi documentation for two-level aggregation --- src/wifi/doc/wifi.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/wifi/doc/wifi.rst b/src/wifi/doc/wifi.rst index 8fbf6c9f5..319c89b4c 100644 --- a/src/wifi/doc/wifi.rst +++ b/src/wifi/doc/wifi.rst @@ -19,7 +19,7 @@ on the IEEE 802.11 standard [ieee80211]_. We will go into more detail below but * basic 802.11 DCF with **infrastructure** and **adhoc** modes * **802.11a**, **802.11b**, **802.11g** and **802.11n** (both 2.4 and 5 GHz bands) physical layers -* **MSDU aggregation** and **MPDU aggregation** extensions of 802.11n +* **MSDU aggregation** and **MPDU aggregation** extensions of 802.11n, and both can be combined together (two-level aggregation) * QoS-based EDCA and queueing extensions of **802.11e** * the ability to use different propagation loss models and propagation delay models, please see the chapter on :ref:`Propagation` for more detail @@ -733,7 +733,6 @@ Note on the current implementation * PHY_RXSTART is not supported * 802.11e TXOP is not supported * 802.11n MIMO is not supported -* hybrid aggregation is not supported Wifi Tracing