LTE RRC: upgrade dissector to v16.6.0

10 files changed, 19 insertions, 17 deletions

diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
index 626b21b0f3..1beb84d481 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V16.5.0 (2021-06)
+-- 3GPP TS 36.331 V16.6.0 (2021-09)
 
 EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
index 15c01511ba..2cc5f354b2 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V16.5.0 (2021-06)
+-- 3GPP TS 36.331 V16.6.0 (2021-09)
 
 EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
 
@@ -2496,7 +2496,7 @@ FailureReportSCG-NR-r15 ::=		SEQUENCE {
 											t310-Expiry, randomAccessProblem,
 											rlc-MaxNumRetx,
 											synchReconfigFailureSCG, scg-reconfigFailure,
-											srb3-IntegrityFailure, other-r16},
+											srb3-IntegrityFailure, dummy},
 	measResultFreqListNR-r15				MeasResultFreqListFailNR-r15		OPTIONAL,
 	measResultSCG-r15						OCTET STRING						OPTIONAL,
 	...,
@@ -3904,9 +3904,6 @@ WLANConnectionStatusReport-v1430-IEs ::=	SEQUENCE {
 }
 
 
-TypeFFS ::= NULL					-- To be removed
-
-
 -- WS modification: asn2wrs does not support this syntax; replace all occurrences
 -- SetupRelease { ElementTypeParam } ::= CHOICE {
 -- 	release			NULL,
@@ -6815,8 +6812,6 @@ PDSCH-ConfigDedicated-v1430 ::=		SEQUENCE {
 PDSCH-ConfigDedicated-v1530 ::=		SEQUENCE {
 	qcl-Operation-v1530						ENUMERATED {typeC}				OPTIONAL,	-- Need OR
 	tbs-IndexAlt3-r15							ENUMERATED {a37}			OPTIONAL,	-- Need OR
-	-- eNote (ToDo): Clarify that eMTC fields (i.e. fields starting with ce-) do not apply
-	-- for SCell (merging issue)
 	ce-CQI-AlternativeTableConfig-r15			ENUMERATED {on}				OPTIONAL,	-- Need OR
 	ce-PDSCH-64QAM-Config-r15					ENUMERATED {on}				OPTIONAL,	-- Need OR
 	ce-PDSCH-FlexibleStartPRB-AllocConfig-r15	ENUMERATED {on}				OPTIONAL,	-- Need OR
@@ -9376,7 +9371,6 @@ SPS-ConfigUL ::=	CHOICE {
 		]],
 		[[ cyclicShiftSPS-r15				ENUMERATED {cs0, cs1, cs2, cs3, cs4, cs5, cs6, cs7}
 												OPTIONAL,	-- Need ON
-	-- eNote (TBC) that no separate STTI field is required (alike in merged CR)
 			harq-ProcID-Offset-r15				INTEGER (0..7)			OPTIONAL,	-- Need ON
 			rv-SPS-UL-Repetitions-r15			ENUMERATED {ulrvseq1, ulrvseq2, ulrvseq3} OPTIONAL, -- Need ON
 			tpc-PDCCH-ConfigPUSCH-SPS-r15		TPC-PDCCH-Config		OPTIONAL,	-- Need ON
@@ -12720,6 +12714,11 @@ UE-EUTRA-Capability-v1630-IEs ::= SEQUENCE {
 
 UE-EUTRA-Capability-v1650-IEs ::= SEQUENCE {
 	otherParameters-v1650				Other-Parameters-v1650			OPTIONAL,
+	nonCriticalExtension				UE-EUTRA-Capability-v1660-IEs		OPTIONAL
+}
+
+UE-EUTRA-Capability-v1660-IEs ::= SEQUENCE {
+	irat-ParametersNR-v1660			IRAT-ParametersNR-v1660,
 	nonCriticalExtension				SEQUENCE {}						OPTIONAL
 }
 
@@ -14161,6 +14160,10 @@ IRAT-ParametersNR-v1610 ::=		SEQUENCE {
 	ce-EUTRA-5GC-HO-ToNR-TDD-FR2-r16	ENUMERATED {supported}				OPTIONAL
 }
 
+IRAT-ParametersNR-v1660 ::=		SEQUENCE {
+	extendedBand-n77-r16				ENUMERATED {supported}				OPTIONAL
+}
+
 EUTRA-5GC-Parameters-r15 ::=		SEQUENCE {
 	eutra-5GC-r15								ENUMERATED {supported}			OPTIONAL,
 	eutra-EPC-HO-EUTRA-5GC-r15				ENUMERATED {supported}			OPTIONAL,
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
index 9bf737c571..edfa0a14d4 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V16.5.0 (2021-06)
+-- 3GPP TS 36.331 V16.6.0 (2021-09)
 
 EUTRA-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
index 654a8a5d37..c2dac9d9a5 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V16.5.0 (2021-06)
+-- 3GPP TS 36.331 V16.6.0 (2021-09)
 
 EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
index 3473b14723..7140aa2edb 100644
--- a/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V16.5.0 (2021-06)
+-- 3GPP TS 36.331 V16.6.0 (2021-09)
 
 NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
index 6dd8964926..eeab394798 100644
--- a/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V16.5.0 (2021-06)
+-- 3GPP TS 36.331 V16.6.0 (2021-09)
 
 NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
index b7da851f44..013a7c8860 100644
--- a/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
+++ b/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V16.5.0 (2021-06)
+-- 3GPP TS 36.331 V16.6.0 (2021-09)
 
 NBIOT-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
index ece296d442..9a9a3d3214 100644
--- a/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V16.5.0 (2021-06)
+-- 3GPP TS 36.331 V16.6.0 (2021-09)
 
 PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
index 7fc85d3bdb..6a4d42717e 100644
--- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
+++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
@@ -810,7 +810,6 @@ SL-V2X-SyncOffsetIndicators-r14
 SL-V2X-TxProfile-r15
 SL-V2X-TxProfileList-r15
 SSB-IndexList-r15
-TypeFFS
 Tx-PreconfigIndex-r14
 VarANR-MeasConfig-NB-r16
 VarANR-MeasReport-NB-r16
diff --git a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
index 5d7ae27a04..e0f64c1e3b 100644
--- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
+++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
@@ -1,7 +1,7 @@
 /* packet-lte-rrc-template.c
  * Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
  * Radio Resource Control (RRC) protocol specification
- * (3GPP TS 36.331 V16.5.0 Release 16) packet dissection
+ * (3GPP TS 36.331 V16.6.0 Release 16) packet dissection
  * Copyright 2008, Vincent Helfre
  * Copyright 2009-2021, Pascal Quantin
  *