From f833fe75679065765bc7846416d096f3cc7d7d91 Mon Sep 17 00:00:00 2001 From: Biljana Bojovic Date: Fri, 3 Feb 2017 19:02:13 +0100 Subject: [PATCH 1/3] lte: update release notes, changes, and lte 3GPP release version. --- CHANGES.html | 14 ++++++++++++++ RELEASE_NOTES | 1 + src/lte/doc/source/conf.py | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGES.html b/CHANGES.html index a36686b30..00ac980c0 100644 --- a/CHANGES.html +++ b/CHANGES.html @@ -65,6 +65,20 @@ us a note on ns-developers mailing list.

  • A new information element has been added: HeCapabilities. This information element is added to the MAC frame header if the node is a HE node. This HeCapabilites information element is used to advertise the HE capabilites of the node to other nodes in the network.
    • +
  • Included carrier aggregation feature in LTE module
    • + +
  • Function PrintRoutingTable has been extended to add an optional Time::Units parameter to specify the time units used on the report. The new parameter is optional and if not specified defaults to the previous behavior (Time::S). diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 96d06a8b2..b1ab0c392 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -23,6 +23,7 @@ New user-visible features ------------------------- - (wifi) 802.11ax High Efficiency (HE) physical layer modes are now supported. - (tcp) The SACK option and the RFC 6675 loss recovery algorithm are now supported. +- (lte) LTE carrier aggregation feature according to 3GPP Release 10 is now supported. Bugs fixed ---------- diff --git a/src/lte/doc/source/conf.py b/src/lte/doc/source/conf.py index 227126cea..35642ff52 100644 --- a/src/lte/doc/source/conf.py +++ b/src/lte/doc/source/conf.py @@ -48,9 +48,9 @@ copyright = u'CTTC' # built documents. # # The short X.Y version. -version = 'v8' +version = 'v10' # The full version, including alpha/beta/rc tags. -release = 'v8' +release = 'v10' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From 135ef95b6ba744e52e3d86f0f279fbffd0df1c38 Mon Sep 17 00:00:00 2001 From: Biljana Bojovic Date: Fri, 3 Feb 2017 19:09:51 +0100 Subject: [PATCH 2/3] lte: remove empty line from changes.html --- CHANGES.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGES.html b/CHANGES.html index 00ac980c0..c03abefbc 100644 --- a/CHANGES.html +++ b/CHANGES.html @@ -75,8 +75,7 @@ us a note on ns-developers mailing list.

  • SAP interfaces are extended to include CA message exchange funtionality.
  • RRC connection procedure is extended to allow RRC connection reconfiguration for the configuration of the secondary carriers.
  • RRC measurement reporting is extended to allow measurement reporting from the secondary carriers.
    • -
  • LTE traces are extended to include component carrier id.
    • -
  • A
    • +
  • LTE traces are extended to include component carrier id.
  • Function PrintRoutingTable has been extended to add an optional Time::Units From 960908c60402ddc8cab216f216cb1ebf74157a51 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Fri, 3 Feb 2017 10:19:28 -0800 Subject: [PATCH 3/3] wifi: Fix wifi documentation build issues --- doc/models/Makefile | 11 ++++++++++- src/wifi/doc/source/wifi-design.rst | 6 ++---- src/wifi/model/wifi-net-device.h | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/doc/models/Makefile b/doc/models/Makefile index d97bb7933..51315f7e3 100644 --- a/doc/models/Makefile +++ b/doc/models/Makefile @@ -121,6 +121,9 @@ SOURCEFIGS = \ $(SRC)/wifi/doc/source/figures/snir.dia \ $(SRC)/wifi/doc/source/figures/clear-channel.eps \ $(SRC)/wifi/doc/source/figures/nist-frame-success-rate.eps \ + $(SRC)/wifi/doc/source/figures/nist-frame-success-rate-n.eps \ + $(SRC)/wifi/doc/source/figures/nist-frame-success-rate-ac.eps \ + $(SRC)/wifi/doc/source/figures/nist-frame-success-rate-ax.eps \ $(SRC)/wimax/doc/WimaxArchitecture.dia \ $(SRC)/lte/doc/source/figures/epc-ctrl-arch.dia \ $(SRC)/lte/doc/source/figures/epc-data-flow-dl.dia \ @@ -370,7 +373,10 @@ IMAGES_EPS = \ $(FIGURES)/802-15-4-per-sens.eps \ $(FIGURES)/802-15-4-psr-distance.eps \ $(FIGURES)/clear-channel.eps \ - $(FIGURES)/nist-frame-success-rate.eps + $(FIGURES)/nist-frame-success-rate.eps \ + $(FIGURES)/nist-frame-success-rate-n.eps \ + $(FIGURES)/nist-frame-success-rate-ac.eps \ + $(FIGURES)/nist-frame-success-rate-ax.eps \ # rescale pdf figures as necessary $(FIGURES)/testbed.pdf_width = 5in @@ -425,6 +431,9 @@ $(FIGURES)/lr-wpan-primitives.pdf_width = 3in $(FIGURES)/lr-wpan-arch.pdf_width = 2in $(FIGURES)/clear-channel.pdf_width = 12cm $(FIGURES)/nist-frame-success-rate.pdf_width = 12cm +$(FIGURES)/nist-frame-success-rate-n.pdf_width = 12cm +$(FIGURES)/nist-frame-success-rate-ac.pdf_width = 12cm +$(FIGURES)/nist-frame-success-rate-ax.pdf_width = 12cm IMAGES_PNG = ${IMAGES_EPS:.eps=.png} IMAGES_PDF = ${IMAGES_EPS:.eps=.pdf} diff --git a/src/wifi/doc/source/wifi-design.rst b/src/wifi/doc/source/wifi-design.rst index 369889675..88cbcccd7 100644 --- a/src/wifi/doc/source/wifi-design.rst +++ b/src/wifi/doc/source/wifi-design.rst @@ -206,10 +206,8 @@ The SpectrumWifiPhy framework uses the ``Spectrum`` channel framework, which is not documented herein but in the Spectrum module documentation. -YansWifiChannel -############### - -This is the only channel model presently in the |ns3| wifi module. The +The YansWifiChannel is the only concrete channel model class in +the |ns3| wifi module. The ``ns3::YansWifiChannel`` implementation uses the propagation loss and delay models provided within the |ns3| :ref:`Propagation` module. In particular, a number of propagation models can be added (chained together, diff --git a/src/wifi/model/wifi-net-device.h b/src/wifi/model/wifi-net-device.h index 2ddf465ac..6e2751a32 100644 --- a/src/wifi/model/wifi-net-device.h +++ b/src/wifi/model/wifi-net-device.h @@ -136,9 +136,9 @@ private: */ void LinkDown (void); /** - * Return the WifiChannel this device is connected to. + * Return the Channel this device is connected to. * - * \return WifiChannel + * \return Ptr to Channel object */ Ptr DoGetChannel (void) const; /**