Update to V9.1.0 (2009-12)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31327 f5534014-38df-0310-8fa8-9805f1628bb7

14 files changed, 524 insertions, 70 deletions

diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn
index d2f2bd39ce..b24a4d220f 100644
--- a/asn1/s1ap/S1AP-CommonDataTypes.asn
+++ b/asn1/s1ap/S1AP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V9.0.0 (2009-09)
+-- 3GPP TS 36.413 V9.1.0 (2009-12)
 -- 9.3.5	Common Definitions
 -- **************************************************************
 --
@@ -35,3 +35,4 @@ TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuc
 END
 
 
+
diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn
index 7195226427..4ac7b26530 100644
--- a/asn1/s1ap/S1AP-Constants.asn
+++ b/asn1/s1ap/S1AP-Constants.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V9.0.0 (2009-09)
+-- 3GPP TS 36.413 V9.1.0 (2009-12)
 -- 9.3.6	Constant Definitions
 -- **************************************************************
 --
@@ -78,6 +78,10 @@ id-eNBConfigurationTransfer			ProcedureCode ::= 40
 id-MMEConfigurationTransfer			ProcedureCode ::= 41
 id-CellTrafficTrace					ProcedureCode ::= 42
 id-Kill								ProcedureCode ::= 43
+id-downlinkUEAssociatedLPPaTransport	ProcedureCode ::= 44
+id-uplinkUEAssociatedLPPaTransport		ProcedureCode ::= 45
+id-downlinkNonUEAssociatedLPPaTransport	ProcedureCode ::= 46
+id-uplinkNonUEAssociatedLPPaTransport	ProcedureCode ::= 47
 
 -- **************************************************************
 --
@@ -103,10 +107,10 @@ maxnoofBPLMNs							INTEGER ::= 6
 maxnoofPLMNsPerMME						INTEGER ::= 32
 maxnoofEPLMNs							INTEGER ::= 15
 maxnoofEPLMNsPlusOne					INTEGER ::= 16
-maxnoofForbLACs							INTEGER ::= 4096		
-maxnoofForbTACs							INTEGER ::= 4096		
+maxnoofForbLACs							INTEGER ::= 4096
+maxnoofForbTACs							INTEGER ::= 4096
 maxNrOfIndividualS1ConnectionsToReset	INTEGER ::= 256
-maxnoofCells							INTEGER ::= 16		
+maxnoofCells							INTEGER ::= 16
 maxnoofTAIforWarning					INTEGER ::= 65535 
 maxnoofCellID							INTEGER ::= 65535 
 maxnoofEmergencyAreaID					INTEGER ::= 65535 
@@ -160,11 +164,11 @@ id-E-RABModifyItemBearerModRes				ProtocolIE-ID ::= 37
 id-E-RABReleaseItem							ProtocolIE-ID ::= 38
 id-E-RABSetupItemBearerSURes				ProtocolIE-ID ::= 39
 id-SecurityContext							ProtocolIE-ID ::= 40
-id-HandoverRestrictionList						ProtocolIE-ID ::= 41
-id-UEPagingID 									ProtocolIE-ID ::= 43
-id-pagingDRX 									ProtocolIE-ID ::= 44
-id-TAIList										ProtocolIE-ID ::= 46
-id-TAIItem										ProtocolIE-ID ::= 47
+id-HandoverRestrictionList					ProtocolIE-ID ::= 41
+id-UEPagingID 								ProtocolIE-ID ::= 43
+id-pagingDRX 								ProtocolIE-ID ::= 44
+id-TAIList									ProtocolIE-ID ::= 46
+id-TAIItem									ProtocolIE-ID ::= 47
 id-E-RABFailedToSetupListCtxtSURes			ProtocolIE-ID ::= 48
 id-E-RABReleaseItemHOCmd					ProtocolIE-ID ::= 49
 id-E-RABSetupItemCtxtSURes					ProtocolIE-ID ::= 50
@@ -251,7 +255,14 @@ id-Target-ToSource-TransparentContainer-Secondary	ProtocolIE-ID ::= 139
 id-EUTRANRoundTripDelayEstimationInfo			ProtocolIE-ID ::= 140
 id-BroadcastCancelledAreaList					ProtocolIE-ID ::= 141
 id-ConcurrentWarningMessageIndicator			ProtocolIE-ID ::= 142
+id-Data-Forwarding-Not-Possible                 ProtocolIE-ID ::= 143
+id-ExtendedRepetitionPeriod						ProtocolIE-ID ::= 144
+id-CellAccessMode								ProtocolIE-ID ::= 145
+id-CSGMembershipStatus 							ProtocolIE-ID ::= 146
+id-LPPa-PDU										ProtocolIE-ID ::= 147
+id-Routing-ID									ProtocolIE-ID ::= 148
 
 END
 
 
+
diff --git a/asn1/s1ap/S1AP-Containers.asn b/asn1/s1ap/S1AP-Containers.asn
index 6b9351416b..c9c6fb85d1 100644
--- a/asn1/s1ap/S1AP-Containers.asn
+++ b/asn1/s1ap/S1AP-Containers.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V9.0.0 (2009-09)
+-- 3GPP TS 36.413 V9.1.0 (2009-12)
 -- 9.3.7	Container Definitions
 -- **************************************************************
 --
@@ -201,3 +201,4 @@ PrivateIE-Field {S1AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 END
 
 
+
diff --git a/asn1/s1ap/S1AP-IEs.asn b/asn1/s1ap/S1AP-IEs.asn
index 0d843d8cfb..d9a0cb6e80 100644
--- a/asn1/s1ap/S1AP-IEs.asn
+++ b/asn1/s1ap/S1AP-IEs.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V9.0.0 (2009-09)
+-- 3GPP TS 36.413 V9.1.0 (2009-12)
 -- 9.3.4	Information Element Definitions
 -- **************************************************************
 --
@@ -212,7 +212,8 @@ CauseRadioNetwork ::= ENUMERATED {
 	x2-handover-triggered,
 	...,
 	redirection-towards-1xRTT,
-	not-supported-QCI-value
+	not-supported-QCI-value,
+	invalid-CSG-Id
 
 }
 
@@ -230,6 +231,11 @@ CauseNas ::= ENUMERATED {
 	...
 }
 
+CellAccessMode ::= ENUMERATED {
+	hybrid, 
+	...
+}
+
 CellIdentity			::= BIT STRING (SIZE (28))
 
 CellID-Broadcast ::= SEQUENCE (SIZE(1..maxnoofCellID)) OF CellID-Broadcast-Item
@@ -334,7 +340,6 @@ CNDomain ::= ENUMERATED {
 ConcurrentWarningMessageIndicator ::= ENUMERATED {
 	true
 }
-
 CSFallbackIndicator ::= ENUMERATED { 
 	cs-fallback-required,
 	...,
@@ -356,6 +361,12 @@ CSG-IdList-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+CSGMembershipStatus ::= ENUMERATED { 
+	member, 
+	not-member
+}
+
+
 COUNTvalue ::= SEQUENCE {
 	pDCP-SN			PDCP-SN,
 	hFN				HFN,
@@ -408,6 +419,10 @@ Direct-Forwarding-Path-Availability ::= ENUMERATED {
 	...
 }
 
+Data-Forwarding-Not-Possible ::= ENUMERATED {
+	data-Forwarding-not-Possible,
+	...
+}
 
 -- E
 
@@ -550,8 +565,6 @@ E-RABItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 }
 
 
-
-
 E-RABLevelQoSParameters ::= SEQUENCE {
 	qCI			QCI,
 	allocationRetentionPriority			AllocationAndRetentionPriority,
@@ -580,6 +593,8 @@ EUTRANRoundTripDelayEstimationInfo ::= INTEGER (0..255)
 
 ExtendedRNC-ID					::= INTEGER (4096..65535)
 
+ExtendedRepetitionPeriod ::= INTEGER (4096..131071)
+
 -- F
 
 ForbiddenInterRATs ::= ENUMERATED {
@@ -730,6 +745,7 @@ LastVisitedGERANCellInformation ::= CHOICE {
 
 L3-Information				::= OCTET STRING
 
+LPPa-PDU ::=  OCTET STRING
 
 -- M
 
@@ -741,7 +757,7 @@ MME-Group-ID	::= OCTET STRING (SIZE (2))
 
 MME-Code		::= OCTET STRING (SIZE (1))
 
-MME-UE-S1AP-ID				::= INTEGER (0..4294967295)
+MME-UE-S1AP-ID	::= INTEGER (0..4294967295)
 M-TMSI			::= OCTET STRING (SIZE (4))
 
 MSClassmark2	::= OCTET STRING
@@ -831,7 +847,7 @@ RIMTransfer ::= SEQUENCE {
 	rIMInformation					RIMInformation,
 	rIMRoutingAddress				RIMRoutingAddress		OPTIONAL,
 	iE-Extensions			ProtocolExtensionContainer { { RIMTransfer-ExtIEs} }			OPTIONAL,
-...
+	...
 }
 
 RIMTransfer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
@@ -866,6 +882,8 @@ RRC-Establishment-Cause ::= ENUMERATED {
 	...
 }
 
+Routing-ID		::= OCTET STRING (SIZE (4))
+
 -- S
 
 
@@ -926,6 +944,7 @@ SONConfigurationTransfer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 Source-ToTarget-TransparentContainer ::= OCTET STRING
 
 SourceBSS-ToTargetBSS-TransparentContainer		::= OCTET STRING
+
 SourceeNB-ID ::= SEQUENCE {
 	global-ENB-ID	Global-ENB-ID,
 	selected-TAI	TAI,
@@ -1256,3 +1275,4 @@ X2TNLConfigurationInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 END
 
 
+
diff --git a/asn1/s1ap/S1AP-PDU-Contents.asn b/asn1/s1ap/S1AP-PDU-Contents.asn
index 978413a980..f78c5ec5d8 100644
--- a/asn1/s1ap/S1AP-PDU-Contents.asn
+++ b/asn1/s1ap/S1AP-PDU-Contents.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413V9.0.0 (2009-09)
+-- 3GPP TS 36.413 V9.1.0 (2009-12)
 -- 9.3.3	PDU Definitions
 -- **************************************************************
 --
@@ -25,6 +25,7 @@ IMPORTS
 	
 	UEAggregateMaximumBitrate,
 	Cause,
+	CellAccessMode,
 	Cdma2000HORequiredIndication,
 	Cdma2000HOStatus,
 	Cdma2000OneXSRVCCInfo,
@@ -38,17 +39,21 @@ IMPORTS
 	CriticalityDiagnostics,
 	CSFallbackIndicator,
 	CSG-Id,
-	CSG-IdList,
+	CSG-IdList, 
+	CSGMembershipStatus,
+	Data-Forwarding-Not-Possible,
 	Direct-Forwarding-Path-Availability,
 	Global-ENB-ID,
 	EUTRAN-CGI,
 	ENBname,
 	ENB-StatusTransfer-TransparentContainer,
 	ENB-UE-S1AP-ID,
+	ExtendedRepetitionPeriod,
 	GTP-TEID,
 	GUMMEI,
 	HandoverRestrictionList,
 	HandoverType,
+	LPPa-PDU,
 	MMEname,
 	MME-UE-S1AP-ID,
 	MSClassmark2,
@@ -65,6 +70,7 @@ IMPORTS
 	E-RAB-ID,
 	E-RABLevelQoSParameters,
 	E-RABList,
+Routing-ID,
 	SecurityKey,
 	SecurityContext,
 	ServedGUMMEIs,
@@ -125,6 +131,7 @@ FROM S1AP-Containers
 
 	id-uEaggregateMaximumBitrate,
 	id-Cause,
+	id-CellAccessMode,
 	id-cdma2000HORequiredIndication,
 	id-cdma2000HOStatus,
 	id-cdma2000OneXSRVCCInfo,
@@ -138,7 +145,9 @@ FROM S1AP-Containers
 	id-CriticalityDiagnostics,
 	id-CSFallbackIndicator,
 	id-CSG-Id,
-	id-CSG-IdList,
+	id-CSG-IdList, 
+	id-CSGMembershipStatus, 
+	id-Data-Forwarding-Not-Possible,
 	id-DefaultPagingDRX,
 	id-Direct-Forwarding-Path-Availability,
 	id-Global-ENB-ID,
@@ -153,6 +162,7 @@ FROM S1AP-Containers
 	id-InitialContextSetup,
 	id-Inter-SystemInformationTransferTypeEDT,
 	id-Inter-SystemInformationTransferTypeMDT,
+	id-LPPa-PDU,
 	id-NAS-DownlinkCount,
 	id-MMEname,
 	id-MME-UE-S1AP-ID,
@@ -165,6 +175,7 @@ FROM S1AP-Containers
 	id-pagingDRX,
 	id-RelativeMMECapacity,
 	id-RequestType,
+	id-Routing-ID,
 	id-E-RABAdmittedItem,
 	id-E-RABAdmittedList,
 	id-E-RABDataForwardingItem,
@@ -247,8 +258,7 @@ FROM S1AP-Containers
 	id-BroadcastCompletedAreaList,
 	id-BroadcastCancelledAreaList,
 	id-RRC-Establishment-Cause,
-	id-TraceCollectionEntityIPAddress,
-	maxnoofTAIs,
+	id-TraceCollectionEntityIPAddress,	maxnoofTAIs,
 	maxNrOfErrors,
 	maxNrOfE-RABs,
 	maxNrOfIndividualS1ConnectionsToReset,
@@ -256,7 +266,8 @@ FROM S1AP-Containers
 	maxnoofCellID,
 	maxnoofTAIforWarning,
 	maxnoofCellinTAI,
-	maxnoofCellinEAI
+	maxnoofCellinEAI,
+	id-ExtendedRepetitionPeriod
 
 
 FROM S1AP-Constants;
@@ -299,7 +310,9 @@ HandoverRequiredIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-Source-ToTarget-TransparentContainer	CRITICALITY reject 	TYPE Source-ToTarget-TransparentContainer 	PRESENCE mandatory }|
 	{ ID id-Source-ToTarget-TransparentContainer-Secondary 	CRITICALITY reject 	TYPE Source-ToTarget-TransparentContainer 	PRESENCE optional }|
 	{ ID id-MSClassmark2							CRITICALITY reject	TYPE MSClassmark2									PRESENCE  conditional }|
-	{ ID id-MSClassmark3							CRITICALITY ignore	TYPE MSClassmark3									PRESENCE conditional },
+	{ ID id-MSClassmark3							CRITICALITY ignore	TYPE MSClassmark3									PRESENCE conditional } |
+	{ ID id-CSG-Id									CRITICALITY reject	TYPE CSG-Id											PRESENCE optional} |
+	{ ID id-CellAccessMode							CRITICALITY reject	TYPE CellAccessMode									PRESENCE optional},
 	...
 }
 
@@ -402,7 +415,9 @@ HandoverRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-SRVCCOperationPossible					CRITICALITY ignore	TYPE SRVCCOperationPossible						PRESENCE optional	}|
 	{ ID id-SecurityContext							CRITICALITY reject	TYPE SecurityContext								PRESENCE mandatory}|
 	{ ID id-NASSecurityParameterstoE-UTRAN			CRITICALITY reject	TYPE NASSecurityParameterstoE-UTRAN			PRESENCE conditional
-	-- This IE shall be present if the Handover Type IE is set to the value "UTRANtoLTE" or "GERANtoLTE" --	},
+	-- This IE shall be present if the Handover Type IE is set to the value "UTRANtoLTE" or "GERANtoLTE" --	} |
+	{ ID id-CSG-Id									CRITICALITY reject	TYPE CSG-Id											PRESENCE optional} |
+	{ ID id-CSGMembershipStatus						CRITICALITY ignore	TYPE CSGMembershipStatus							PRESENCE optional} ,
 	...
 }
 
@@ -423,6 +438,7 @@ E-RABToBeSetupItemHOReq ::= SEQUENCE {
 }
 
 E-RABToBeSetupItemHOReq-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	{ID	id-Data-Forwarding-Not-Possible	   CRITICALITY ignore	EXTENSION  Data-Forwarding-Not-Possible   PRESENCE optional},
 	...
 }
 
@@ -981,7 +997,8 @@ InitialContextSetupRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-UERadioCapability			CRITICALITY ignore	TYPE UERadioCapability				PRESENCE optional	}|
 	{ ID id-SubscriberProfileIDforRFP	CRITICALITY ignore	TYPE SubscriberProfileIDforRFP	PRESENCE optional	}|
 	{ ID id-CSFallbackIndicator			CRITICALITY reject		TYPE CSFallbackIndicator		PRESENCE optional	}|
-	{ ID id-SRVCCOperationPossible			CRITICALITY ignore	TYPE SRVCCOperationPossible		PRESENCE optional	},
+	{ ID id-SRVCCOperationPossible			CRITICALITY ignore	TYPE SRVCCOperationPossible		PRESENCE optional	}|
+	{ ID id-CSGMembershipStatus			CRITICALITY	 ignore		TYPE CSGMembershipStatus		PRESENCE optional	},
 	...
 }
 
@@ -1203,7 +1220,8 @@ UEContextModificationRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-SubscriberProfileIDforRFP	CRITICALITY ignore	TYPE SubscriberProfileIDforRFP	PRESENCE optional	}|
 	{ ID id-uEaggregateMaximumBitrate	CRITICALITY ignore	TYPE UEAggregateMaximumBitrate		PRESENCE optional	}|
 	{ ID id-CSFallbackIndicator			CRITICALITY reject		TYPE CSFallbackIndicator		PRESENCE optional	}|
-	{ ID id-UESecurityCapabilities		CRITICALITY reject	TYPE UESecurityCapabilities			PRESENCE optional	},
+	{ ID id-UESecurityCapabilities		CRITICALITY reject	TYPE UESecurityCapabilities			PRESENCE optional	}|
+	{ ID id-CSGMembershipStatus			CRITICALITY	ignore	TYPE CSGMembershipStatus			PRESENCE optional	},
 	...
 }
 -- **************************************************************
@@ -1286,7 +1304,8 @@ InitialUEMessage-IEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-RRC-Establishment-Cause		CRITICALITY ignore	TYPE RRC-Establishment-Cause		PRESENCE mandatory} |
 	{ ID id-S-TMSI						CRITICALITY reject	TYPE S-TMSI							PRESENCE optional} |
 	{ ID id-CSG-Id						CRITICALITY reject	TYPE CSG-Id							PRESENCE optional} |
-	{ ID id-GUMMEI-ID					CRITICALITY reject	TYPE GUMMEI							PRESENCE optional},
+	{ ID id-GUMMEI-ID					CRITICALITY reject	TYPE GUMMEI							PRESENCE optional} |
+	{ ID id-CellAccessMode				CRITICALITY reject	TYPE CellAccessMode					PRESENCE optional},
 	...
 }
 
@@ -1542,7 +1561,7 @@ ENBConfigurationUpdateFailure ::= SEQUENCE {
 ENBConfigurationUpdateFailureIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	}|
 	{ ID id-TimeToWait					CRITICALITY ignore	TYPE TimeToWait					PRESENCE optional	}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics	PRESENCE optional },
 ...
 }
 
@@ -1626,7 +1645,7 @@ DownlinkS1cdma2000tunneling ::= SEQUENCE {
 DownlinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory	} |
 	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory	} |
-	{ ID id-E-RABSubjecttoDataForwardingList					CRITICALITY ignore	TYPE E-RABSubjecttoDataForwardingList		 			PRESENCE optional	} |
+	{ ID id-E-RABSubjecttoDataForwardingList		CRITICALITY ignore	TYPE E-RABSubjecttoDataForwardingList		 			PRESENCE optional	} |
 	{ ID id-cdma2000HOStatus				CRITICALITY ignore	TYPE Cdma2000HOStatus 			PRESENCE optional	} |
 	{ ID id-cdma2000RATType				CRITICALITY reject	TYPE Cdma2000RATType 			PRESENCE mandatory	} |
 	{ ID id-cdma2000PDU					CRITICALITY reject	TYPE Cdma2000PDU	 			PRESENCE mandatory	},
@@ -1951,6 +1970,7 @@ WriteReplaceWarningRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-SerialNumber				CRITICALITY reject	TYPE SerialNumber		PRESENCE mandatory		}|
 	{ ID id-WarningAreaList				CRITICALITY ignore	TYPE WarningAreaList		PRESENCE optional		}|
 	{ ID id-RepetitionPeriod			CRITICALITY reject	TYPE RepetitionPeriod		PRESENCE mandatory		}|
+	{ ID id-ExtendedRepetitionPeriod	CRITICALITY reject	TYPE ExtendedRepetitionPeriod	PRESENCE optional	}|
 	{ ID id-NumberofBroadcastRequest	CRITICALITY reject	TYPE NumberofBroadcastRequest	PRESENCE mandatory	}|
 	{ ID id-WarningType					CRITICALITY ignore	TYPE WarningType			PRESENCE optional		}|
 	{ ID id-WarningSecurityInfo			CRITICALITY ignore	TYPE WarningSecurityInfo	PRESENCE optional		}|
@@ -1973,7 +1993,7 @@ WriteReplaceWarningResponse ::= SEQUENCE {
 WriteReplaceWarningResponseIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MessageIdentifier			CRITICALITY reject	TYPE MessageIdentifier		PRESENCE mandatory		}|
 	{ ID id-SerialNumber				CRITICALITY reject	TYPE SerialNumber		PRESENCE mandatory		}|
-	{ ID id-BroadcastCompletedAreaList		CRITICALITY reject	TYPE BroadcastCompletedAreaList		PRESENCE mandatory	}|
+	{ ID id-BroadcastCompletedAreaList		CRITICALITY ignore	TYPE BroadcastCompletedAreaList		PRESENCE optional	}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics				PRESENCE optional},
 	...
 }
@@ -2129,5 +2149,84 @@ KillResponseIEs S1AP-PROTOCOL-IES ::= {
 	...
 }
 
+-- **************************************************************
+--
+-- LPPA TRANSPORT ELEMENTARY PROCEDURES
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- DOWNLINK UE ASSOCIATED LPPA TRANSPORT
+--
+-- **************************************************************
+
+DownlinkUEAssociatedLPPaTransport ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       {{DownlinkUEAssociatedLPPaTransport-IEs}},
+	...
+}
+
+DownlinkUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-Routing-ID			CRITICALITY reject	TYPE Routing-ID				PRESENCE mandatory} |
+	{ ID id-LPPa-PDU    			CRITICALITY reject	TYPE LPPa-PDU   				PRESENCE mandatory} ,
+	...
+}
+
+-- **************************************************************
+--
+-- UPLINK UE ASSOCIATED LPPA TRANSPORT
+--
+-- **************************************************************
+
+UplinkUEAssociatedLPPaTransport ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       {{UplinkUEAssociatedLPPaTransport-IEs}},
+	...
+}
+
+UplinkUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-Routing-ID			CRITICALITY reject	TYPE Routing-ID				PRESENCE mandatory} |
+	{ ID id-LPPa-PDU    			CRITICALITY reject	TYPE LPPa-PDU   				PRESENCE mandatory} ,
+	...
+}
+
+-- **************************************************************
+--
+-- DOWNLINK NON UE ASSOCIATED LPPA TRANSPORT
+--
+-- **************************************************************
+
+DownlinkNonUEAssociatedLPPaTransport ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       {{DownlinkNonUEAssociatedLPPaTransport-IEs}},
+	...
+}
+
+DownlinkNonUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-Routing-ID			    CRITICALITY reject	TYPE Routing-ID				    PRESENCE mandatory} | 
+	{ ID id-LPPa-PDU    			CRITICALITY reject	TYPE LPPa-PDU   				PRESENCE mandatory} ,
+	...
+}
+
+-- **************************************************************
+--
+-- UPLINK NON UE ASSOCIATED LPPA TRANSPORT
+--
+-- **************************************************************
+
+UplinkNonUEAssociatedLPPaTransport ::= SEQUENCE {
+	protocolIEs		ProtocolIE-Container       {{UplinkNonUEAssociatedLPPaTransport-IEs}},
+	...
+}
+
+UplinkNonUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-Routing-ID			    CRITICALITY reject	TYPE Routing-ID					PRESENCE mandatory} | 
+	{ ID id-LPPa-PDU    			CRITICALITY reject	TYPE LPPa-PDU   				PRESENCE mandatory} ,
+	...
+}
+
 END
 
+
diff --git a/asn1/s1ap/S1AP-PDU-Descriptions.asn b/asn1/s1ap/S1AP-PDU-Descriptions.asn
index de5b91d37b..9258903d0d 100644
--- a/asn1/s1ap/S1AP-PDU-Descriptions.asn
+++ b/asn1/s1ap/S1AP-PDU-Descriptions.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V9.0.0 (2009-09)
+-- 3GPP TS 36.413 V9.1.0 (2009-12)
 -- 9.3.2	Elementary Procedure Definitions
 -- **************************************************************
 --
@@ -28,7 +28,9 @@ FROM S1AP-CommonDataTypes
 
 	CellTrafficTrace,
 	DeactivateTrace,
+	DownlinkUEAssociatedLPPaTransport,
 	DownlinkNASTransport,
+	DownlinkNonUEAssociatedLPPaTransport,
 	DownlinkS1cdma2000tunneling,
 	ENBDirectInformationTransfer,
 	ENBStatusTransfer,
@@ -88,7 +90,9 @@ FROM S1AP-CommonDataTypes
 	UEContextReleaseCommand,
 	UEContextReleaseComplete,
 	UEContextReleaseRequest,
+	UplinkUEAssociatedLPPaTransport,
 	UplinkNASTransport,
+	UplinkNonUEAssociatedLPPaTransport,
 	UplinkS1cdma2000tunneling,
 	WriteReplaceWarningRequest,
 	WriteReplaceWarningResponse,
@@ -100,7 +104,9 @@ FROM S1AP-PDU-Contents
 	
 	id-CellTrafficTrace,
 	id-DeactivateTrace,
+	id-downlinkUEAssociatedLPPaTransport,
 	id-downlinkNASTransport,
+	id-downlinkNonUEAssociatedLPPaTransport,
 	id-DownlinkS1cdma2000tunneling,
 	id-eNBStatusTransfer,
 	id-ErrorIndication,
@@ -137,7 +143,9 @@ FROM S1AP-PDU-Contents
 	id-UEContextModification,
 	id-UEContextRelease,
 	id-UEContextReleaseRequest,
+	id-uplinkUEAssociatedLPPaTransport,
 	id-uplinkNASTransport,
+	id-uplinkNonUEAssociatedLPPaTransport,
 	id-UplinkS1cdma2000tunneling,
 	id-WriteReplaceWarning,
 	id-eNBConfigurationTransfer,
@@ -259,7 +267,11 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
 	eNBConfigurationTransfer		|
 	mMEConfigurationTransfer		|
 	privateMessage					,
-	...
+	...,
+	downlinkUEAssociatedLPPaTransport	|
+	uplinkUEAssociatedLPPaTransport	|
+	downlinkNonUEAssociatedLPPaTransport	|
+	uplinkNonUEAssociatedLPPaTransport
 }
 
 -- **************************************************************
@@ -556,5 +568,29 @@ kill S1AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY			reject
 }
 
+downlinkUEAssociatedLPPaTransport S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		DownlinkUEAssociatedLPPaTransport
+	PROCEDURE CODE			id-downlinkUEAssociatedLPPaTransport
+	CRITICALITY				ignore
+}
+
+uplinkUEAssociatedLPPaTransport S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UplinkUEAssociatedLPPaTransport
+	PROCEDURE CODE			id-uplinkUEAssociatedLPPaTransport
+	CRITICALITY				ignore
+}
+downlinkNonUEAssociatedLPPaTransport S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		DownlinkNonUEAssociatedLPPaTransport
+	PROCEDURE CODE			id-downlinkNonUEAssociatedLPPaTransport
+	CRITICALITY				ignore
+}
+
+uplinkNonUEAssociatedLPPaTransport S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UplinkNonUEAssociatedLPPaTransport
+	PROCEDURE CODE			id-uplinkNonUEAssociatedLPPaTransport
+	CRITICALITY				ignore
+}
+
 END
 
+
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index 40f4fe67c7..7d3e9ba1ea 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -463,6 +463,10 @@ id-eNBConfigurationTransfer				ProcedureCode
 id-MMEConfigurationTransfer				ProcedureCode
 id-CellTrafficTrace						ProcedureCode
 id-Kill									ProcedureCode
+id-downlinkUEAssociatedLPPaTransport	ProcedureCode
+id-uplinkUEAssociatedLPPaTransport		ProcedureCode
+id-downlinkNonUEAssociatedLPPaTransport	ProcedureCode
+id-uplinkNonUEAssociatedLPPaTransport	ProcedureCode
 
 # ProtocolIE-ID
 id-MME-UE-S1AP-ID									ProtocolIE-ID
@@ -591,6 +595,12 @@ id-Target-ToSource-TransparentContainer-Secondary	ProtocolIE-ID
 id-EUTRANRoundTripDelayEstimationInfo				ProtocolIE-ID
 id-BroadcastCancelledAreaList						ProtocolIE-ID
 id-ConcurrentWarningMessageIndicator				ProtocolIE-ID
+id-Data-Forwarding-Not-Possible						ProtocolIE-ID
+id-ExtendedRepetitionPeriod							ProtocolIE-ID
+id-CellAccessMode									ProtocolIE-ID
+id-CSGMembershipStatus								ProtocolIE-ID
+id-LPPa-PDU											ProtocolIE-ID
+id-Routing-ID										ProtocolIE-ID
 #.END
 
 #.REGISTER_NEW
@@ -718,6 +728,11 @@ Target-ToSource-TransparentContainer	N s1ap.ies id-Target-ToSource-TransparentCo
 EUTRANRoundTripDelayEstimationInfo		N s1ap.ies id-EUTRANRoundTripDelayEstimationInfo
 BroadcastCancelledAreaList				N s1ap.ies id-BroadcastCancelledAreaList
 ConcurrentWarningMessageIndicator		N s1ap.ies id-ConcurrentWarningMessageIndicator
+ExtendedRepetitionPeriod				N s1ap.ies id-ExtendedRepetitionPeriod
+CellAccessMode							N s1ap.ies id-CellAccessMode
+CSGMembershipStatus						N s1ap.ies id-CSGMembershipStatus
+LPPa-PDU								N s1ap.ies id-LPPa-PDU
+Routing-ID								N s1ap.ies id-Routing-ID
 
 #S1AP-PROTOCOL-IES-PAIR
 #RAB-SetupOrModifyItemFirst				N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@@ -726,6 +741,7 @@ ConcurrentWarningMessageIndicator		N s1ap.ies id-ConcurrentWarningMessageIndicat
 #S1AP-PROTOCOL-EXTENSION
 #RAB-Parameters							N s1ap.extension id-AlternativeRABConfiguration
 #Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf N s1ap.extension id-Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf
+Data-Forwarding-Not-Possible			N s1ap.extension id-Data-Forwarding-Not-Possible
 
 #S1AP-ELEMENTARY-PROCEDURE
 HandoverRequired						N s1ap.proc.imsg id-HandoverPreparation
@@ -840,6 +856,14 @@ CellTrafficTrace						N s1ap.proc.imsg id-CellTrafficTrace
 KillRequest								N s1ap.proc.imsg id-Kill
 KillResponse							N s1ap.proc.sout id-Kill
 
+DownlinkUEAssociatedLPPaTransport		N s1ap.proc.imsg id-downlinkUEAssociatedLPPaTransport
+
+UplinkUEAssociatedLPPaTransport			N s1ap.proc.imsg id-uplinkUEAssociatedLPPaTransport
+
+DownlinkNonUEAssociatedLPPaTransport	N s1ap.proc.imsg id-downlinkNonUEAssociatedLPPaTransport
+
+UplinkNonUEAssociatedLPPaTransport		N s1ap.proc.imsg id-uplinkNonUEAssociatedLPPaTransport
+
 
 #.TYPE_ATTR
 BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL
diff --git a/asn1/x2ap/X2AP-CommonDataTypes.asn b/asn1/x2ap/X2AP-CommonDataTypes.asn
index 710cce9b52..451391fc1d 100644
--- a/asn1/x2ap/X2AP-CommonDataTypes.asn
+++ b/asn1/x2ap/X2AP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V9.0.0 (2009-09)
+-- 3GPP TS 36.423 V9.1.0 (2009-12)
 
 -- 9.3.6	Common definitions
 -- **************************************************************
diff --git a/asn1/x2ap/X2AP-Constants.asn b/asn1/x2ap/X2AP-Constants.asn
index 1e384a02f7..1117c809aa 100644
--- a/asn1/x2ap/X2AP-Constants.asn
+++ b/asn1/x2ap/X2AP-Constants.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V9.0.0 (2009-09)
+-- 3GPP TS 36.423 V9.1.0 (2009-12)
 -- 9.3.7	Constant Definitions
 -- **************************************************************
 --
@@ -37,7 +37,10 @@ id-reset														ProcedureCode ::= 7
 id-eNBConfigurationUpdate										ProcedureCode ::= 8
 id-resourceStatusReportingInitiation							ProcedureCode ::= 9
 id-resourceStatusReporting										ProcedureCode ::= 10
-id-privateMessage												ProcedureCode ::= 11
+id-privateMessage												ProcedureCode ::= 11 
+id-mobilitySettingsChange										ProcedureCode ::= 12 
+id-rLFIndication												ProcedureCode ::= 13 
+id-handoverReport												ProcedureCode ::= 14
 
 
 
@@ -114,7 +117,19 @@ id-ReportCharacteristics													ProtocolIE-ID ::= 38
 id-ENB1-Measurement-ID														ProtocolIE-ID ::= 39
 id-ENB2-Measurement-ID														ProtocolIE-ID ::= 40
 id-Number-of-Antennaports													ProtocolIE-ID ::= 41
-
-
+id-CompositeAvailableCapacityGroup											ProtocolIE-ID ::= 42
+id-ENB1-Cell-ID																ProtocolIE-ID ::= 43
+id-ENB2-Cell-ID																ProtocolIE-ID ::= 44
+id-ENB2-Proposed-Mobility-Parameters										ProtocolIE-ID ::= 45
+id-ENB1-Mobility-Parameters													ProtocolIE-ID ::= 46
+id-ENB2-Mobility-Parameters-Modification-Range								ProtocolIE-ID ::= 47
+id-FailureCellPCI															ProtocolIE-ID ::= 48
+id-Re-establishmentCellECGI													ProtocolIE-ID ::= 49
+id-FailureCellCRNTI															ProtocolIE-ID ::= 50
+id-ShortMAC-I																ProtocolIE-ID ::= 51
+id-SourceCellECGI															ProtocolIE-ID ::= 52
+id-FailureCellECGI															ProtocolIE-ID ::= 53
+id-HandoverReportType														ProtocolIE-ID ::= 54
+id-PRACH-Configuration														ProtocolIE-ID ::= 55
 
 END
diff --git a/asn1/x2ap/X2AP-Containers.asn b/asn1/x2ap/X2AP-Containers.asn
index 209f70c16e..debbcf53cc 100644
--- a/asn1/x2ap/X2AP-Containers.asn
+++ b/asn1/x2ap/X2AP-Containers.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V9.0.0 (2009-09)
+-- 3GPP TS 36.423 V9.1.0 (2009-12)
 -- 9.3.8	Container Definitions
 -- **************************************************************
 --
@@ -194,6 +194,3 @@ PrivateIE-Field {X2AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 }
 
 END
-
-
-
diff --git a/asn1/x2ap/X2AP-IEs.asn b/asn1/x2ap/X2AP-IEs.asn
index d20d3fe31c..d56845a224 100644
--- a/asn1/x2ap/X2AP-IEs.asn
+++ b/asn1/x2ap/X2AP-IEs.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V9.0.0 (2009-09)
+-- 3GPP TS 36.423 V9.1.0 (2009-12)
 -- 9.3.5	Information Element Definitions
 -- **************************************************************
 --
@@ -19,9 +19,10 @@ IMPORTS
 	
 	id-E-RAB-Item,
 	id-Number-of-Antennaports,
+	id-PRACH-Configuration,
 
-
-	maxnoofBearers,	maxCellineNB,
+	maxnoofBearers,	
+	maxCellineNB,
 	maxEARFCN,
 	maxInterfaces,
 	
@@ -87,6 +88,10 @@ BroadcastPLMNs-Item ::= SEQUENCE (SIZE(1..maxnoofBPLMNs)) OF PLMN-Identity
 
 -- C
 
+CapacityValue ::= INTEGER (0..100)
+
+CellCapacityClassValue ::= INTEGER (1..100, ...)
+
 Cause ::= CHOICE {
 	radioNetwork		CauseRadioNetwork,
 	transport			CauseTransport,
@@ -138,7 +143,10 @@ CauseRadioNetwork ::= ENUMERATED {
 	unknown-eNB-Measurement-ID,
 	measurement-temporarily-not-available,
 	unspecified,
-	...
+	...,
+	load-balancing,
+	handover-optimisation,
+	value-out-of-allowed-range
 
 }
 
@@ -162,6 +170,27 @@ CellType-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+CompositeAvailableCapacityGroup	::= SEQUENCE {
+	dL-CompositeAvailableCapacity					CompositeAvailableCapacity,
+	uL-CompositeAvailableCapacity					CompositeAvailableCapacity,
+	iE-Extensions									ProtocolExtensionContainer { { CompositeAvailableCapacityGroup-ExtIEs} } OPTIONAL,
+	...
+}
+
+CompositeAvailableCapacityGroup-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+CompositeAvailableCapacity ::= SEQUENCE {
+	cellCapacityClassValue							CellCapacityClassValue				OPTIONAL,
+	capacityValue									CapacityValue,
+	iE-Extensions									ProtocolExtensionContainer { { CompositeAvailableCapacity-ExtIEs} } OPTIONAL,
+	...
+}
+
+CompositeAvailableCapacity-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 COUNTvalue ::= SEQUENCE {
 	pDCP-SN					PDCP-SN,
@@ -202,6 +231,8 @@ CriticalityDiagnostics-IE-List-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+CRNTI ::= BIT STRING (SIZE (16))
+
 CyclicPrefixDL ::= ENUMERATED { 
 	normal,
 	extended,
@@ -433,6 +464,12 @@ GUMMEI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 -- H
 
+HandoverReportType  ::= ENUMERATED {
+	hoTooEarly,
+	hoToWrongCell,
+	...
+}
+
 HandoverRestrictionList ::= SEQUENCE {
 	servingPLMN					PLMN-Identity,
 	equivalentPLMNs				EPLMNs					OPTIONAL,
@@ -532,7 +569,19 @@ MME-Group-ID	::= OCTET STRING (SIZE (2))
 
 MME-Code		::= OCTET STRING (SIZE (1))
 
-Measurement-ID	::= INTEGER (1..4095, ...)
+Measurement-ID	::= INTEGER (1..4095, ...) 
+
+MobilityParametersModificationRange ::= SEQUENCE {
+	handoverTriggerChangeLowerLimit		INTEGER (-20..20),
+	handoverTriggerChangeUpperLimit		INTEGER (-20..20),
+	...
+}
+
+MobilityParametersInformation ::= SEQUENCE {
+	handoverTriggerChange			INTEGER (-20..20),
+	...
+}
+
 
 -- N
 
@@ -567,6 +616,20 @@ PCI ::= INTEGER (0..503, ...)
 
 PLMN-Identity ::= OCTET STRING (SIZE(3))
 
+PRACH-Configuration  ::= SEQUENCE {
+	rootSequenceIndex						INTEGER (0..837),
+	zeroCorrelationIndex					INTEGER (0..15),
+	highSpeedFlag							BOOLEAN,
+	prach-FreqOffset						INTEGER (0..94),
+	prach-ConfigIndex						INTEGER (0..63)        OPTIONAL,  -- present for TDD --
+	iE-Extensions							ProtocolExtensionContainer { {PRACH-Configuration-ExtIEs} }	OPTIONAL,
+	...
+}
+
+PRACH-Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 Pre-emptionCapability ::= ENUMERATED {
 	shall-not-trigger-pre-emption,
 	may-trigger-pre-emption
@@ -705,10 +768,13 @@ ServedCell-Information ::= SEQUENCE {
 }
 
 ServedCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-	{ ID id-Number-of-Antennaports			CRITICALITY ignore	EXTENSION Number-of-Antennaports				PRESENCE optional },
+	{ ID id-Number-of-Antennaports			CRITICALITY ignore	EXTENSION Number-of-Antennaports				PRESENCE optional }|
+	{ ID id-PRACH-Configuration				CRITICALITY ignore	EXTENSION PRACH-Configuration				PRESENCE optional },
 	...
 }
 
+ShortMAC-I ::= BIT STRING (SIZE(16))
+
 SRVCCOperationPossible ::= ENUMERATED {
 	possible,
 	...
@@ -885,4 +951,3 @@ UL-HighInterferenceIndication ::= BIT STRING (SIZE(1..110, ...))
 -- Z
 
 END
-
diff --git a/asn1/x2ap/X2AP-PDU-Contents.asn b/asn1/x2ap/X2AP-PDU-Contents.asn
index 6da4b9735b..a39869083c 100644
--- a/asn1/x2ap/X2AP-PDU-Contents.asn
+++ b/asn1/x2ap/X2AP-PDU-Contents.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V9.0.0 (2009-09)
+-- 3GPP TS 36.423 V9.1.0 (2009-12)
 -- 9.3.4	PDU Definitions
 -- **************************************************************
 --
@@ -26,9 +26,10 @@ IMPORTS
 	AS-SecurityInformation,	
 	
 	Cause,
-	
+	CompositeAvailableCapacityGroup,	
 	COUNTvalue,
-	CriticalityDiagnostics,
+	CriticalityDiagnostics, 
+	CRNTI,
 	DL-Forwarding,
 	ECGI,
 	E-RAB-ID,
@@ -38,10 +39,12 @@ IMPORTS
 	GlobalENB-ID,
 	GTPtunnelEndpoint,
 	GUGroupIDList,
-	GUMMEI,
+	GUMMEI, 
+	HandoverReportType,
 	HandoverRestrictionList,
 	LocationReportingInformation,
-	Neighbour-Information,
+	Neighbour-Information, 
+	PCI,
 	PDCP-SN,
 	PLMN-Identity,
 	ReceiveStatusofULPDCPSDUs,
@@ -50,7 +53,8 @@ IMPORTS
 	RadioResourceStatus,
 	RRC-Context,
 	ServedCell-Information,
-	ServedCells,
+	ServedCells, 
+	ShortMAC-I,
 	SRVCCOperationPossible,
 	SubscriberProfileIDforRFP,
 	TargeteNBtoSource-eNBTransparentContainer,
@@ -69,7 +73,10 @@ IMPORTS
 	HWLoadIndicator,
 	S1TNLLoadIndicator,
 	Measurement-ID,
-	ReportCharacteristics
+	ReportCharacteristics,
+	MobilityParametersInformation,
+	MobilityParametersModificationRange
+
 	
 	
 	
@@ -95,7 +102,8 @@ FROM X2AP-Containers
 	id-CellMeasurementResult,
 	id-CellMeasurementResult-Item,
 	id-CellToReport,
-	id-CellToReport-Item,
+	id-CellToReport-Item, 
+	id-CompositeAvailableCapacityGroup,
 	id-CriticalityDiagnostics,
 	id-E-RABs-Admitted-Item,
 	id-E-RABs-Admitted-List,
@@ -127,8 +135,20 @@ FROM X2AP-Containers
 	id-Measurement-ID,
 	id-ReportCharacteristics,
 	id-ENB1-Measurement-ID,
-	id-ENB2-Measurement-ID,
-	
+	id-ENB2-Measurement-ID, 
+	id-ENB1-Cell-ID,
+	id-ENB2-Cell-ID,
+	id-ENB2-Proposed-Mobility-Parameters,
+	id-ENB1-Mobility-Parameters,
+	id-ENB2-Mobility-Parameters-Modification-Range, 
+	id-FailureCellPCI,
+	id-Re-establishmentCellECGI,
+	id-FailureCellCRNTI,
+	id-ShortMAC-I, 
+	id-SourceCellECGI,
+	id-FailureCellECGI,
+	id-Re-establishmentCellECGI,
+	id-HandoverReportType,
 
 
 	maxCellineNB,	
@@ -262,6 +282,26 @@ HandoverPreparationFailure-IEs X2AP-PROTOCOL-IES ::= {
 
 -- **************************************************************
 --
+-- Handover Report
+--
+-- **************************************************************
+
+HandoverReport ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{HandoverReport-IEs}},
+	...
+}
+
+HandoverReport-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-HandoverReportType			CRITICALITY ignore	TYPE HandoverReportType PRESENCE mandatory}|
+	{ ID id-Cause						CRITICALITY ignore	TYPE Cause				PRESENCE mandatory} |
+	{ ID id-SourceCellECGI				CRITICALITY ignore	TYPE ECGI				PRESENCE mandatory}|
+	{ ID id-FailureCellECGI				CRITICALITY ignore	TYPE ECGI				PRESENCE mandatory} |
+	{ ID id-Re-establishmentCellECGI	CRITICALITY ignore	TYPE ECGI				PRESENCE conditional} -- The IE shall be present if the Handover Report Type IE is set to “HO to Wrong Cell” -- ,
+	...
+}
+
+-- **************************************************************
+--
 -- SN Status Transfer
 --
 -- **************************************************************
@@ -680,6 +720,7 @@ CellMeasurementResult-Item ::= SEQUENCE {
 }
 
 CellMeasurementResult-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+{ ID id-CompositeAvailableCapacityGroup	CRITICALITY ignore   EXTENSION CompositeAvailableCapacityGroup		PRESENCE optional	},
 	...
 }
 
@@ -699,4 +740,78 @@ PrivateMessage-IEs X2AP-PRIVATE-IES ::= {
 	...
 }
 
+-- **************************************************************
+--
+-- MOBILITY CHANGE REQUEST
+--
+-- **************************************************************
+
+MobilityChangeRequest ::= SEQUENCE {
+	protocolIEs		ProtocolIE-Container  {{MobilityChangeRequest-IEs}},
+	...
+}
+
+MobilityChangeRequest-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-ENB1-Cell-ID						CRITICALITY reject	TYPE ECGI											PRESENCE mandatory	}|
+	{ ID id-ENB2-Cell-ID						CRITICALITY reject	TYPE ECGI											PRESENCE mandatory	}|
+	{ ID id-ENB1-Mobility-Parameters			CRITICALITY ignore	TYPE MobilityParametersInformation				PRESENCE optional	}|
+	{ ID id-ENB2-Proposed-Mobility-Parameters	CRITICALITY reject	TYPE MobilityParametersInformation				PRESENCE mandatory	}|
+	{ ID id-Cause								CRITICALITY reject	TYPE Cause											PRESENCE mandatory	},
+	...
+}
+
+-- **************************************************************
+--
+-- MOBILITY CHANGE ACKNOWLEDGE
+--
+-- **************************************************************
+
+MobilityChangeAcknowledge ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{MobilityChangeAcknowledge-IEs}},
+	...
+}
+
+MobilityChangeAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-CriticalityDiagnostics	CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
+	...
+}
+
+
+-- **************************************************************
+--
+-- MOBILITY CHANGE FAILURE
+--
+-- **************************************************************
+
+MobilityChangeFailure ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{MobilityChangeFailure-IEs}},
+	...
+}
+
+MobilityChangeFailure-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-Cause											CRITICALITY ignore	TYPE Cause												PRESENCE mandatory	}|
+	{ ID id-ENB2-Mobility-Parameters-Modification-Range		CRITICALITY ignore	TYPE MobilityParametersModificationRange		PRESENCE optional	}|
+	{ ID id-CriticalityDiagnostics							CRITICALITY ignore	TYPE CriticalityDiagnostics						PRESENCE optional },
+	...
+}
+
+-- **************************************************************
+--
+-- Radio Link Failure Indication
+--
+-- **************************************************************
+
+RLFIndication ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{RLFIndication-IEs}},
+	...
+}
+
+RLFIndication-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-FailureCellPCI				CRITICALITY ignore		TYPE PCI			PRESENCE mandatory}|
+	{ ID id-Re-establishmentCellECGI	CRITICALITY ignore		TYPE ECGI			PRESENCE mandatory}|
+	{ ID id-FailureCellCRNTI			CRITICALITY ignore		TYPE CRNTI			PRESENCE mandatory}|
+	{ ID id-ShortMAC-I					CRITICALITY ignore		TYPE ShortMAC-I		PRESENCE optional},
+	...
+}
+
 END
diff --git a/asn1/x2ap/X2AP-PDU-Descriptions.asn b/asn1/x2ap/X2AP-PDU-Descriptions.asn
index 7ff0707118..e9d2c2b8c2 100644
--- a/asn1/x2ap/X2AP-PDU-Descriptions.asn
+++ b/asn1/x2ap/X2AP-PDU-Descriptions.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V9.0.0 (2009-09)
+-- 3GPP TS 36.423 V9.1.0 (2009-12)
 -- 9.3.3	Elementary Procedure Definitions
 -- **************************************************************
 --
@@ -31,7 +31,8 @@ FROM X2AP-CommonDataTypes
 	ENBConfigurationUpdateAcknowledge,
 	ENBConfigurationUpdateFailure,
 	ErrorIndication,
-	HandoverCancel,
+	HandoverCancel, 
+	HandoverReport,
 	HandoverPreparationFailure,	
 	HandoverRequest,
 	HandoverRequestAcknowledge,
@@ -42,12 +43,15 @@ FROM X2AP-CommonDataTypes
 	ResourceStatusFailure,
 	ResourceStatusRequest,
 	ResourceStatusResponse,
-	ResourceStatusUpdate,
+	ResourceStatusUpdate, 
+	RLFIndication,
 	SNStatusTransfer,
 	UEContextRelease,
 	X2SetupFailure,	X2SetupRequest,
-	X2SetupResponse
-	
+	X2SetupResponse,
+	MobilityChangeRequest,
+	MobilityChangeAcknowledge,
+	MobilityChangeFailure	
 
 
 
@@ -55,7 +59,8 @@ FROM X2AP-PDU-Contents
 
 	id-eNBConfigurationUpdate,
 	id-errorIndication,
-	id-handoverCancel,
+	id-handoverCancel, 
+	id-handoverReport,
 	id-handoverPreparation,
 	
 	id-loadIndication,
@@ -63,10 +68,12 @@ FROM X2AP-PDU-Contents
 	id-reset,
 	
 	id-resourceStatusReporting,
-	id-resourceStatusReportingInitiation,
+	id-resourceStatusReportingInitiation, 
+	id-rLFIndication,
 	id-snStatusTransfer,
 	id-uEContextRelease,
-	id-x2Setup
+	id-x2Setup,
+	id-mobilitySettingsChange
 
 
 
@@ -143,7 +150,8 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-1 X2AP-ELEMENTARY-PROCEDURE ::= {
 	reset													|
 	x2Setup													|
 	resourceStatusReportingInitiation						|
-	eNBConfigurationUpdate									,
+	eNBConfigurationUpdate									|
+	mobilitySettingsChange									,
 	...
 }
 
@@ -154,7 +162,8 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-2 X2AP-ELEMENTARY-PROCEDURE ::= {
 	errorIndication							|
 	resourceStatusReporting					|
 	loadIndication							|
-	privateMessage							,
+	privateMessage							|
+	rLFIndication							|	handoverReport,
 	...
 
 }
@@ -193,6 +202,12 @@ handoverCancel X2AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				ignore
 }
 
+handoverReport X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		HandoverReport
+	PROCEDURE CODE			id-handoverReport
+	CRITICALITY				ignore
+}
+
 errorIndication X2AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE		ErrorIndication
 	PROCEDURE CODE			id-errorIndication
@@ -243,10 +258,25 @@ resourceStatusReporting X2AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				ignore
 }
 
+rLFIndication X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		RLFIndication
+	PROCEDURE CODE			id-rLFIndication
+	CRITICALITY				ignore
+}
+
 privateMessage			X2AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE		PrivateMessage
 	PROCEDURE CODE			id-privateMessage
 	CRITICALITY				ignore
 }
 
+mobilitySettingsChange	X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		MobilityChangeRequest
+	SUCCESSFUL OUTCOME		MobilityChangeAcknowledge
+	UNSUCCESSFUL OUTCOME	MobilityChangeFailure
+	PROCEDURE CODE			id-mobilitySettingsChange
+	CRITICALITY				reject
+}
+
+
 END
diff --git a/asn1/x2ap/x2ap.cnf b/asn1/x2ap/x2ap.cnf
index bbbe272b5b..7f9075161c 100644
--- a/asn1/x2ap/x2ap.cnf
+++ b/asn1/x2ap/x2ap.cnf
@@ -158,6 +158,9 @@ id-eNBConfigurationUpdate				ProcedureCode
 id-resourceStatusReportingInitiation	ProcedureCode
 id-resourceStatusReporting				ProcedureCode
 id-privateMessage						ProcedureCode
+id-mobilitySettingsChange				ProcedureCode
+id-rLFIndication						ProcedureCode
+id-handoverReport						ProcedureCode
 
 # ProtocolIE-ID
 
@@ -202,6 +205,21 @@ id-ReportCharacteristics													ProtocolIE-ID
 id-ENB1-Measurement-ID														ProtocolIE-ID
 id-ENB2-Measurement-ID														ProtocolIE-ID
 id-Number-of-Antennaports													ProtocolIE-ID
+id-CompositeAvailableCapacityGroup											ProtocolIE-ID
+id-ENB1-Cell-ID																ProtocolIE-ID
+id-ENB2-Cell-ID																ProtocolIE-ID
+id-ENB2-Proposed-Mobility-Parameters										ProtocolIE-ID
+id-ENB1-Mobility-Parameters													ProtocolIE-ID
+id-ENB2-Mobility-Parameters-Modification-Range								ProtocolIE-ID
+id-FailureCellPCI															ProtocolIE-ID
+id-Re-establishmentCellECGI													ProtocolIE-ID
+id-FailureCellCRNTI															ProtocolIE-ID
+id-ShortMAC-I																ProtocolIE-ID
+id-SourceCellECGI															ProtocolIE-ID
+id-FailureCellECGI															ProtocolIE-ID
+id-HandoverReportType														ProtocolIE-ID
+id-PRACH-Configuration														ProtocolIE-ID
+
 #.REGISTER_NEW
 
 #X2AP-PROTOCOL-IES
@@ -245,9 +263,23 @@ SRVCCOperationPossible						N x2ap.ies id-SRVCCOperationPossible
 ReportCharacteristics						N x2ap.ies id-ReportCharacteristics
 Measurement-ID								N x2ap.ies id-ENB1-Measurement-ID
 Measurement-ID								N x2ap.ies id-ENB2-Measurement-ID
+ECGI										N x2ap.ies id-ENB1-Cell-ID
+ECGI										N x2ap.ies id-ENB2-Cell-ID
+MobilityParametersInformation				N x2ap.ies id-ENB2-Proposed-Mobility-Parameters
+MobilityParametersInformation				N x2ap.ies id-ENB1-Mobility-Parameters
+MobilityParametersModificationRange			N x2ap.ies id-ENB2-Mobility-Parameters-Modification-Range
+PCI											N x2ap.ies id-FailureCellPCI
+ECGI										N x2ap.ies id-Re-establishmentCellECGI
+CRNTI										N x2ap.ies id-FailureCellCRNTI
+ShortMAC-I									N x2ap.ies id-ShortMAC-I
+ECGI										N x2ap.ies id-SourceCellECGI
+ECGI										N x2ap.ies id-FailureCellECGI
+HandoverReportType							N x2ap.ies id-HandoverReportType
 
 #X2AP-PROTOCOL-EXTENSION
 Number-of-Antennaports						N x2ap.extension id-Number-of-Antennaports
+CompositeAvailableCapacityGroup				N x2ap.extension id-CompositeAvailableCapacityGroup
+PRACH-Configuration							N x2ap.extension id-PRACH-Configuration
 
 # X2AP-PDU-Descriptions.asn  Interface Elementary Procedures
 #X2AP-ELEMENTARY-PROCEDURE
@@ -284,6 +316,14 @@ ResourceStatusUpdate				N x2ap.proc.imsg id-resourceStatusReporting
 
 PrivateMessage						N x2ap.proc.imsg id-privateMessage
 
+HandoverReport						N x2ap.proc.imsg id-handoverReport
+
+RLFIndication						N x2ap.proc.imsg id-rLFIndication
+
+MobilityChangeRequest				N x2ap.proc.imsg id-mobilitySettingsChange
+MobilityChangeAcknowledge			N x2ap.proc.sout id-mobilitySettingsChange
+MobilityChangeFailure				N x2ap.proc.uout id-mobilitySettingsChange
+
 #.TYPE_ATTR
 BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL
 #.END