Update to V9.0.0 (2009-12)

svn path=/trunk/; revision=31404

29 files changed, 231 insertions, 118 deletions

diff --git a/asn1/gsm_map/GSMMAP.asn b/asn1/gsm_map/GSMMAP.asn
index d20c794b3c..59918e00c4 100644
--- a/asn1/gsm_map/GSMMAP.asn
+++ b/asn1/gsm_map/GSMMAP.asn
@@ -607,6 +607,11 @@ SendRoutingInfoResV2 ::= SEQUENCE {
 -- cug-CheckInfo must be absent in version 1 
 	...
 	} 
-
+-- Removed from SS-DataTypes.asn in Rel 9.0.0
+BeginSubscriberActivityArg ::= SEQUENCE {
+    imsi            IMSI,
+    originatingEntityNumber ISDN-AddressString,
+    msisdn                  [PRIVATE 28] AddressString OPTIONAL,
+    ... }
 END
 
diff --git a/asn1/gsm_map/MAP-ApplicationContexts.asn b/asn1/gsm_map/MAP-ApplicationContexts.asn
index 49b7a3c920..dc0aa8d772 100644
--- a/asn1/gsm_map/MAP-ApplicationContexts.asn
+++ b/asn1/gsm_map/MAP-ApplicationContexts.asn
@@ -1,7 +1,7 @@
 -- $Id$
 --17.3.3	ASN.1 Module for application-context-names
 --The following ASN.1 module summarises the application-context-name assigned to MAP application-contexts.
--- 3GPP TS 29.002 V8.9.0 (2009-04)
+-- 3GPP TS 29.002 V9.0.0 (2009-12)
 MAP-ApplicationContexts {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-ApplicationContexts (2) version11 (11)}
@@ -195,3 +195,4 @@ resourceManagementContext-v3  OBJECT IDENTIFIER ::=
 
 END
 
+
diff --git a/asn1/gsm_map/MAP-BS-Code.asn b/asn1/gsm_map/MAP-BS-Code.asn
index 933b3c6696..e589c4e344 100644
--- a/asn1/gsm_map/MAP-BS-Code.asn
+++ b/asn1/gsm_map/MAP-BS-Code.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04) 
+-- 3GPP TS 29.002 V9.0.0 (2009-12) 
 -- 17.7.10	Bearer Service Codes
  
 MAP-BS-Code {
diff --git a/asn1/gsm_map/MAP-CH-DataTypes.asn b/asn1/gsm_map/MAP-CH-DataTypes.asn
index df14fb8025..e5e0db426c 100644
--- a/asn1/gsm_map/MAP-CH-DataTypes.asn
+++ b/asn1/gsm_map/MAP-CH-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04)
+-- 3GPP TS 29.002 V9.0.0 (2009-12)
 -- 17.7.3	Call handling data types
  
 MAP-CH-DataTypes {
@@ -37,7 +37,7 @@ IST-CommandRes,
 UU-Data,
 ReleaseResourcesArg,
 ReleaseResourcesRes,
---- WS added exports needed by gsm_map.asn (extra asn1 file to handle older proto. ver.)
+-- WS added exports needed by gsm_map.asn (extra asn1 file to handle older proto. ver.)
 RoutingInfo,
 CUG-CheckInfo
 ;
@@ -473,4 +473,3 @@ ReleaseResourcesRes ::= SEQUENCE{
 
 
 END
-
diff --git a/asn1/gsm_map/MAP-CallHandlingOperations.asn b/asn1/gsm_map/MAP-CallHandlingOperations.asn
index 1d21a0a57b..91c982af0a 100644
--- a/asn1/gsm_map/MAP-CallHandlingOperations.asn
+++ b/asn1/gsm_map/MAP-CallHandlingOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04) 
+-- 3GPP TS 29.002 V9.0.0 (2009-12) 
 --17.6.3	Call Handling Operations
 MAP-CallHandlingOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
@@ -213,4 +213,3 @@ releaseResources  OPERATION::= {				--Timer m
 	CODE	local:20 }
 
 END
-
diff --git a/asn1/gsm_map/MAP-CommonDataTypes.asn b/asn1/gsm_map/MAP-CommonDataTypes.asn
index 82b13de08f..a964c9c30a 100644
--- a/asn1/gsm_map/MAP-CommonDataTypes.asn
+++ b/asn1/gsm_map/MAP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04)
+-- 3GPP TS 29.002 V9.0.0 (2009-12)
 -- 17.7.8	Common data types
 
 MAP-CommonDataTypes {
@@ -67,9 +67,11 @@ AccessNetworkSignalInfo,
 	LCSClientExternalID,
 	LCSClientInternalID,
 	LCSServiceTypeID,
---- WS added exports needed by gsm_map.asn (extra asn1 file to handle older prot. ver.)
+-- WS added exports needed by gsm_map.asn (extra asn1 file to handle older prot. ver.)
 	ProtocolId,
-	LCSServiceTypeID	
+	-- gprs location registration types
+	GSN-Address
+
 ;
 
 IMPORTS
@@ -302,6 +304,9 @@ alertingCategory-5   AlertingPattern ::= '00001000'B
 	-- all other values of Alerting Category are reserved
 	-- Alerting categories are defined in GSM 02.07
 
+GSN-Address ::= OCTET STRING (SIZE (5..17))
+	-- Octets are coded according to TS 3GPP TS 23.003 [17]
+
 -- data types for numbering and identification
 
 IMSI ::= TBCD-STRING (SIZE (3..8))
@@ -389,9 +394,9 @@ NAEA-PreferredCI ::= SEQUENCE {
 
 NAEA-CIC ::= OCTET STRING (SIZE (3))
 	-- The internal structure is defined by the Carrier Identification
-	-- parameter in ANSI T1.113.3. Carrier codes between "000" and "999" may
-	-- be encoded as 3 digits using "000" to "999" or as 4 digits using 
-	-- "0000" to "0999". Carrier codes between "1000" and "9999" are encoded
+	-- parameter in ANSI T1.113.3. Carrier codes between “000” and “999” may
+	-- be encoded as 3 digits using “000” to “999” or as 4 digits using 
+	-- “0000” to “0999”. Carrier codes between “1000” and “9999” are encoded
 	-- using 4 digits.
 
 SubscriberIdentity ::= CHOICE {
@@ -624,10 +629,9 @@ AgeOfLocationInformation ::= INTEGER (0..32767)
 -- the value represents the elapsed time in minutes since the last
 -- network contact of the mobile station (i.e. the actuality of the
 -- location information).
--- value "0" indicates that the MS is currently in contact with the
+-- value “0” indicates that the MS is currently in contact with the
 --           network
--- value "32767" indicates that the location information is at least
+-- value “32767” indicates that the location information is at least
 --               32767 minutes old
 
 END
-
diff --git a/asn1/gsm_map/MAP-DialogueInformation.asn b/asn1/gsm_map/MAP-DialogueInformation.asn
index fd66160908..2c6ff94948 100644
--- a/asn1/gsm_map/MAP-DialogueInformation.asn
+++ b/asn1/gsm_map/MAP-DialogueInformation.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04) 
+-- 3GPP TS 29.002 V9.0.0 (2009-12) 
 -- 17.4	MAP Dialogue Information
 
 MAP-DialogueInformation {
@@ -126,5 +126,3 @@ MAP-ProviderAbortReason ::= ENUMERATED {
 	invalidPDU  (1)}
 
 END
-
-
diff --git a/asn1/gsm_map/MAP-ER-DataTypes.asn b/asn1/gsm_map/MAP-ER-DataTypes.asn
index 30ebabeb24..be34c073a9 100644
--- a/asn1/gsm_map/MAP-ER-DataTypes.asn
+++ b/asn1/gsm_map/MAP-ER-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04) 
+-- 3GPP TS 29.002 V9.0.0 (2009-12) 
 -- 17.7.7	Error data types
 
 MAP-ER-DataTypes {
@@ -412,4 +412,3 @@ OngoingGroupCallParam ::= SEQUENCE {
 
 
 END
-
diff --git a/asn1/gsm_map/MAP-Errors.asn b/asn1/gsm_map/MAP-Errors.asn
index ac454f926b..d9daace1b9 100644
--- a/asn1/gsm_map/MAP-Errors.asn
+++ b/asn1/gsm_map/MAP-Errors.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04)  
+-- 3GPP TS 29.002 V9.0.0 (2009-12)  
 -- 17.6.6	Errors
  
 MAP-Errors {
@@ -507,4 +507,3 @@ mm-EventNotSupported  ERROR ::= {
 
 
 END
-
diff --git a/asn1/gsm_map/MAP-ExtensionDataTypes.asn b/asn1/gsm_map/MAP-ExtensionDataTypes.asn
index e815286519..0b86325956 100644
--- a/asn1/gsm_map/MAP-ExtensionDataTypes.asn
+++ b/asn1/gsm_map/MAP-ExtensionDataTypes.asn
@@ -1,7 +1,7 @@
 -- $Id$
 -- MAP-ExtensionDataTypes.asn
 --
--- Taken from 3GPP TS 29.002 V8.9.0 (2009-04)
+-- Taken from 3GPP TS 29.002 V9.0.0 (2009-12)
 --
 -- 17.7.11 Extension data types
 --
@@ -71,4 +71,3 @@ SLR-Arg-PCS-Extensions ::= SEQUENCE {
 	na-ESRK-Request	[0]	NULL		OPTIONAL }
 
 END
-
diff --git a/asn1/gsm_map/MAP-GR-DataTypes.asn b/asn1/gsm_map/MAP-GR-DataTypes.asn
index 486dd4545e..a3fa6ac596 100644
--- a/asn1/gsm_map/MAP-GR-DataTypes.asn
+++ b/asn1/gsm_map/MAP-GR-DataTypes.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- Taken from 3GPP TS 29.002 V8.9.0 (2009-04)
+-- Taken from 3GPP TS 29.002 V9.0.0 (2009-12)
 --
 --17.7.12	Group Call data types
  
@@ -196,4 +196,3 @@ SendGroupCallInfoRes ::= SEQUENCE {
 
 
 END
-
diff --git a/asn1/gsm_map/MAP-Group-Call-Operations.asn b/asn1/gsm_map/MAP-Group-Call-Operations.asn
index b14657f73d..bad0217512 100644
--- a/asn1/gsm_map/MAP-Group-Call-Operations.asn
+++ b/asn1/gsm_map/MAP-Group-Call-Operations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04)  
+-- 3GPP TS 29.002 V9.0.0 (2009-12)  
 -- 17.6.7	Group Call operations
  
 MAP-Group-Call-Operations {
@@ -96,4 +96,3 @@ sendGroupCallInfo  OPERATION ::= {				--Timer m
 
 
 END
-
diff --git a/asn1/gsm_map/MAP-LCS-DataTypes.asn b/asn1/gsm_map/MAP-LCS-DataTypes.asn
index 152ba42795..f4cee8b25f 100644
--- a/asn1/gsm_map/MAP-LCS-DataTypes.asn
+++ b/asn1/gsm_map/MAP-LCS-DataTypes.asn
@@ -1,7 +1,7 @@
 -- $Id$
 -- MAP-LCS-DataTypes.asn
 --
--- Taken from 3GPP TS 29.002  V8.9.0 (2009-04)
+-- Taken from 3GPP TS 29.002  V9.0.0 (2009-12)
 --
 -- 17.7.13 Location service data types
 --
@@ -53,7 +53,8 @@ IMPORTS
 	LCSClientInternalID,
 LCSServiceTypeID,
 CellGlobalIdOrServiceAreaIdOrLAI,
-PLMN-Id
+PLMN-Id,
+	GSN-Address
 FROM MAP-CommonDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-CommonDataTypes (18) version11 (11)}
@@ -71,7 +72,6 @@ FROM MAP-SS-DataTypes {
    map-SS-DataTypes (14) version11 (11)}
 
 	APN,
-	GSN-Address,
 	SupportedLCS-CapabilitySets
 FROM MAP-MS-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
@@ -654,4 +654,3 @@ SubscriberLocationReport-Res ::= SEQUENCE {
 
 
 END
-
diff --git a/asn1/gsm_map/MAP-LocationServiceOperations.asn b/asn1/gsm_map/MAP-LocationServiceOperations.asn
index 08c1dea315..e226ef9b75 100644
--- a/asn1/gsm_map/MAP-LocationServiceOperations.asn
+++ b/asn1/gsm_map/MAP-LocationServiceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04)  
+-- 3GPP TS 29.002 V9.0.0 (2009-12)  
 -- 17.6.8	Location service operations
  
 MAP-LocationServiceOperations {
@@ -105,4 +105,3 @@ subscriberLocationReport  OPERATION ::= {				--Timer m
 
 
 END
-
diff --git a/asn1/gsm_map/MAP-MS-DataTypes.asn b/asn1/gsm_map/MAP-MS-DataTypes.asn
index 0a4f896fd3..91cb617484 100644
--- a/asn1/gsm_map/MAP-MS-DataTypes.asn
+++ b/asn1/gsm_map/MAP-MS-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04) 
+-- 3GPP TS 29.002 V9.0.0 (2009-12) 
 -- 17.7.1	Mobile Service data types
 
 MAP-MS-DataTypes {
@@ -30,8 +30,6 @@ EXPORTS
 	IST-SupportIndicator, 
 	SupportedLCS-CapabilitySets,
 
-	-- gprs location registration types
-	GSN-Address,
 
 	-- handover types
 	ForwardAccessSignalling-Arg,
@@ -65,7 +63,8 @@ AuthenticationFailureReportRes,
 	DeleteSubscriberDataRes,
 	Ext-QoS-Subscribed,
 	Ext2-QoS-Subscribed, 
-	Ext3-QoS-Subscribed,
+	Ext3-QoS-Subscribed, 
+	Ext4-QoS-Subscribed,
 	SubscriberData,
 	ODB-Data,
 	SubscriberStatus,
@@ -210,7 +209,8 @@ ISDN-AddressString,
 	TBCD-STRING,
 	LAIFixedLength,
 	PLMN-Id,
-EMLPP-Priority
+EMLPP-Priority,
+GSN-Address
 FROM MAP-CommonDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-CommonDataTypes (18) version11 (11)}
@@ -351,7 +351,8 @@ TypeOfUpdate ::= ENUMERATED {
 CancellationType ::= ENUMERATED {
 	updateProcedure	(0),
 	subscriptionWithdraw	(1),
-	...}
+	...,
+	initialAttachProcedure               (2)}
 	-- The HLR shall not send values other than listed above
 
 CancelLocationRes ::= SEQUENCE {
@@ -511,7 +512,11 @@ UpdateGprsLocationArg ::= SEQUENCE {
 	eps-info		[5]	EPS-Info	OPTIONAL,
 	servingNodeTypeIndicator	[6]	NULL		OPTIONAL,
 	skipSubscriberDataUpdate	[7] NULL		OPTIONAL,
-	usedRAT-Type	[8] Used-RAT-Type	OPTIONAL 
+	usedRAT-Type	[8] Used-RAT-Type	OPTIONAL,
+	gprsSubscriptionDataNotNeeded	[9] NULL		OPTIONAL,
+	nodeTypeIndicator	[10] NULL		OPTIONAL,
+	areaRestricted	[11] NULL		OPTIONAL,
+	ue-reachableIndicator	[12]	NULL		OPTIONAL 
 	 }
 
 Used-RAT-Type::= ENUMERATED {
@@ -535,7 +540,8 @@ PDN-GW-Update ::= SEQUENCE{
 
 ISR-Information::= BIT STRING {
 	updateMME  (0),
-	cancelSGSN  (1)} (SIZE (2..8))
+	cancelSGSN  (1),
+	initialAttachIndicator  (2)} (SIZE (3..8))
 	-- exception handling: reception of unknown bit assignments in the
 	-- ISR-Information data type shall be discarded by the receiver 
 
@@ -552,14 +558,32 @@ SGSN-Capability ::= SEQUENCE{
 	supportedFeatures	[9] SupportedFeatures	OPTIONAL }
 
 SupportedFeatures::= BIT STRING {
-	odb-all (0),
+	odb-all-apn (0),
 	odb-HPLMN-APN (1),
 	odb-VPLMN-APN (2),
-	regSub (3)} (SIZE (4..8))
-
-GSN-Address ::= OCTET STRING (SIZE (5..17))
-	-- Octets are coded according to TS 3GPP TS 23.003 [17]
-
+	odb-all-og (3),
+	odb-all-international-og (4),
+	odb-all-int-og-not-to-HPLMN-country (5),
+	odb-all-interzonal-og (6),
+	odb-all-interzonal-og-not-to-HPLMN-country (7),
+	odb-all-interzonal-og-and-internat-og-not-to-HPLMN-country (8),
+	regSub (9),
+	trace (10),
+	lcs-all-PrivExcep (11),
+	lcs-universal (12),
+	lcs-CallSessionRelated (13),
+	lcs-CallSessionUnrelated (14),
+	lcs-PLMN-operator (15),
+	lcs-ServiceType (16),
+	lcs-all-MOLR-SS (17),
+	lcs-basicSelfLocation (18),
+	lcs-autonomousSelfLocation (19),
+	lcs-transferToThirdParty (20),
+	sm-mo-pp (21),
+	barring-OutgoingCalls (22),
+	baoc (23),
+	boic (24),
+	boicExHC (25)} (SIZE (26..40))
 UpdateGprsLocationRes ::= SEQUENCE {
 	hlr-Number	ISDN-AddressString,
 	extensionContainer	ExtensionContainer	OPTIONAL,
@@ -975,7 +999,8 @@ InsertSubscriberDataArg ::= SEQUENCE {
 	accessRestrictionData	[19] AccessRestrictionData	OPTIONAL,
 	ics-Indicator	[20]	BOOLEAN	OPTIONAL,
 	eps-SubscriptionData	[31]	EPS-SubscriptionData	OPTIONAL,
-	csg-SubscriptionDataList	[32] CSG-SubscriptionDataList	OPTIONAL }
+	csg-SubscriptionDataList	[32] CSG-SubscriptionDataList	OPTIONAL,
+	ue-ReachabilityRequestIndicator	[33]	NULL		OPTIONAL }
 	-- If the Network Access Mode parameter is sent, it shall be present only in 
 	-- the first sequence if seqmentation is used
 
@@ -997,7 +1022,8 @@ Time ::= OCTET STRING (SIZE (4))
 
 EPS-SubscriptionData ::= SEQUENCE {
 	apn-oi-Replacement	[0]	APN-OI-Replacement	OPTIONAL,
-	rfsp-id		[2]	RFSP-ID		OPTIONAL,
+	-- this apn-oi-Replacement refers to the UE level apn-oi-Replacement.
+	rfsp-id		[2]	RFSP-ID	OPTIONAL,
 	ambr			[3]	AMBR		OPTIONAL,
 	apn-ConfigurationProfile	[4]	APN-ConfigurationProfile	OPTIONAL,
 	stn-sr		[6]	ISDN-AddressString	OPTIONAL,
@@ -1027,16 +1053,24 @@ maxNumOfAPN-Configurations  INTEGER ::= 50
 
 APN-Configuration ::= SEQUENCE {
 	contextId		[0] ContextId,
-	servedPartyIP-Address	[1] PDP-Address	OPTIONAL,
-	apn			[2] APN,
-	eps-qos-Subscribed	[3] EPS-QoS-Subscribed,
-	pdn-gw-Identity	[4] PDN-GW-Identity	OPTIONAL,
-	pdn-gw-AllocationType	[5] PDN-GW-AllocationType	OPTIONAL,
-	vplmnAddressAllowed	[6] NULL		OPTIONAL,
-	chargingCharacteristics	[7] ChargingCharacteristics	OPTIONAL,
-	ambr			[8] AMBR		OPTIONAL,
-	specificAPNInfoList	[9] SpecificAPNInfoList	OPTIONAL,	extensionContainer	[10] ExtensionContainer	OPTIONAL,
-	... }
+	pdn-Type		[1] PDN-Type,
+	servedPartyIP-IPv4-Address	[2] PDP-Address	OPTIONAL,
+	apn			[3] APN,
+	eps-qos-Subscribed	[4] EPS-QoS-Subscribed,
+	pdn-gw-Identity	[5] PDN-GW-Identity	OPTIONAL,
+	pdn-gw-AllocationType	[6] PDN-GW-AllocationType	OPTIONAL,
+	vplmnAddressAllowed	[7] NULL		OPTIONAL,
+	chargingCharacteristics	[8] ChargingCharacteristics	OPTIONAL,
+	ambr			[9] AMBR		OPTIONAL,
+	specificAPNInfoList	[10] SpecificAPNInfoList	OPTIONAL,	extensionContainer	[11] ExtensionContainer	OPTIONAL, 
+	servedPartyIP-IPv6-Address	[12] PDP-Address	OPTIONAL,
+	...,
+	apn-oi-Replacement	[13] APN-OI-Replacement	OPTIONAL
+	-- this apn-oi-Replacement refers to the APN level apn-oi-Replacement.
+ }
+
+PDN-Type ::= OCTET STRING (SIZE (1))
+	-- Octet is coded according to TS 3GPP TS 29.274 [140]
 
 EPS-QoS-Subscribed ::= SEQUENCE {
 	qos-Class-Identifier	[0] QoS-Class-Identifier,
@@ -1156,8 +1190,13 @@ PDP-Context ::= SEQUENCE {
 	pdp-ChargingCharacteristics	[1] ChargingCharacteristics	OPTIONAL,
 	ext2-QoS-Subscribed	[2] Ext2-QoS-Subscribed	OPTIONAL,
 	-- ext2-QoS-Subscribed may be present only if ext-QoS-Subscribed is present.
-	ext3-QoS-Subscribed	[3] Ext3-QoS-Subscribed	OPTIONAL
+	ext3-QoS-Subscribed	[3] Ext3-QoS-Subscribed	OPTIONAL,
 	-- ext3-QoS-Subscribed may be present only if ext2-QoS-Subscribed is present.
+	ext4-QoS-Subscribed	[4] Ext4-QoS-Subscribed	OPTIONAL,
+	-- ext4-QoS-Subscribed may be present only if ext3-QoS-Subscribed is present. 
+	apn-oi-Replacement	[5]	APN-OI-Replacement	OPTIONAL
+	-- this apn-oi-Replacement refers to the APN level apn-oi-Replacement and has
+	-- higher priority than UE level apn-oi-Replacement.
 	 }
 
 ContextId ::= INTEGER (1..maxNumOfPDP-Contexts)
@@ -1168,7 +1207,10 @@ GPRSSubscriptionData ::= SEQUENCE {
 		-- first segment of GPRSSubscriptionData.
 	gprsDataList	[1]	GPRSDataList,
 	extensionContainer	[2] ExtensionContainer	OPTIONAL,
-	... }
+	...,
+	apn-oi-Replacement	[3]	APN-OI-Replacement	OPTIONAL
+	-- this apn-oi-Replacement refers to the UE level apn-oi-Replacement.
+ }
 
 SGSN-CAMEL-SubscriptionInfo ::= SEQUENCE {
 	gprs-CSI		[0]	GPRS-CSI	OPTIONAL,
@@ -1261,6 +1303,12 @@ Ext2-QoS-Subscribed ::= OCTET STRING (SIZE (1..3))
 Ext3-QoS-Subscribed ::= OCTET STRING (SIZE (1..2))
 	-- Octets 1-2 are coded according to 3GPP TS 24.008 [35] Quality of Service Octets 17-18.
 
+Ext4-QoS-Subscribed ::= OCTET STRING (SIZE (1))
+	-- Octet 1:
+	--  Evolved Allocation/Retention Priority. This octet encodes the Priority Level (PL),
+	--  the Preemption Capability (PCI) and Preemption Vulnerability  (PVI) values, as
+	--  described in 3GPP TS 29.060 [105].
+
 ChargingCharacteristics ::= OCTET STRING (SIZE (2))
 	-- Octets are coded according to 3GPP TS 32.215.
 
@@ -1372,7 +1420,7 @@ ODB-GeneralData ::= BIT STRING {
 	-- ODB-GeneralData type shall be treated like unsupported ODB-GeneralData
 	-- When the ODB-GeneralData type is removed from the HLR for a given subscriber, 
 	-- in NoteSubscriberDataModified operation sent toward the gsmSCF 
-	-- all bits shall be set to "O".
+	-- all bits shall be set to “O“.
 
 ODB-HPLMN-Data ::= BIT STRING {
 	plmn-SpecificBarringType1  (0),
@@ -1383,7 +1431,7 @@ ODB-HPLMN-Data ::= BIT STRING {
 	-- ODB-HPLMN-Data type shall be treated like unsupported ODB-HPLMN-Data 
 	-- When the ODB-HPLMN-Data type is removed from the HLR for a given subscriber, 
 	-- in NoteSubscriberDataModified operation sent toward the gsmSCF
-	-- all bits shall be set to "O".
+	-- all bits shall be set to “O“.
 
 Ext-SS-InfoList ::= SEQUENCE SIZE (1..maxNumOfSS) OF
 				Ext-SS-Info
@@ -2391,12 +2439,21 @@ LocationInformation ::= SEQUENCE {
 	msc-Number	[6] ISDN-AddressString	OPTIONAL,
 	geodeticInformation	[7] GeodeticInformation	OPTIONAL, 
 	currentLocationRetrieved	[8] NULL		OPTIONAL,
-	sai-Present	[9] NULL		OPTIONAL }
+	sai-Present	[9] NULL		OPTIONAL,
+	locationInformationEPS	[10]LocationInformationEPS	OPTIONAL }
 -- sai-Present indicates that the cellGlobalIdOrServiceAreaIdOrLAI parameter contains
 -- a Service Area Identity.
 -- currentLocationRetrieved shall be present 
 -- if the location information were retrieved after a successfull paging.
 
+LocationInformationEPS ::= SEQUENCE {
+	e-utranCellGlobalIdentity	[0] OCTET STRING (SIZE(7))		OPTIONAL,
+-- Octets are coded as described in 3GPP TS 29.118.
+	trackingAreaIdentity	[1] OCTET STRING (SIZE(6))		OPTIONAL,
+-- Octets are coded as described in 3GPP TS 29.118.
+	extensionContainer	[2] ExtensionContainer		OPTIONAL,
+	...}
+
 LocationInformationGPRS ::= SEQUENCE {
 	cellGlobalIdOrServiceAreaIdOrLAI	[0] CellGlobalIdOrServiceAreaIdOrLAI OPTIONAL,
 	routeingAreaIdentity	[1] RAIdentity	OPTIONAL,
@@ -2662,7 +2719,12 @@ AnyTimeModificationArg ::= SEQUENCE {
 	longFTN-Supported	[6]	NULL		OPTIONAL,
 	...,
 	modificationRequestFor-ODB-data	[7]	ModificationRequestFor-ODB-data OPTIONAL,
-	modificationRequestFor-IP-SM-GW-Data	[8]	ModificationRequestFor-IP-SM-GW-Data OPTIONAL }
+	modificationRequestFor-IP-SM-GW-Data	[8]	ModificationRequestFor-IP-SM-GW-Data OPTIONAL,
+	activationRequestForUE-reachability	[9]	ServingNode	OPTIONAL }
+
+ServingNode ::= BIT STRING {
+	mme (0)} (SIZE (1..8))
+-- Other bits than listed above shall be discarded.
 
 AnyTimeModificationRes ::= SEQUENCE {
 	ss-InfoFor-CSE	[0]	Ext-SS-InfoFor-CSE	OPTIONAL,
@@ -2730,7 +2792,8 @@ NoteSubscriberDataModifiedArg ::= SEQUENCE {
 	camel-SubscriptionInfo	[3] CAMEL-SubscriptionInfo	OPTIONAL,
 	allInformationSent	[4] NULL		OPTIONAL,
 	extensionContainer	ExtensionContainer	OPTIONAL,
-	...}
+	...,
+	ue-reachable	[5] ServingNode	OPTIONAL }
 
 NoteSubscriberDataModifiedRes ::= SEQUENCE {
 	extensionContainer	ExtensionContainer	OPTIONAL,
@@ -2777,4 +2840,3 @@ Ext-CallBarringInfoFor-CSE ::= SEQUENCE {
 	...}
 
 END
-
diff --git a/asn1/gsm_map/MAP-MobileServiceOperations.asn b/asn1/gsm_map/MAP-MobileServiceOperations.asn
index 63089e45fe..73bd676c99 100644
--- a/asn1/gsm_map/MAP-MobileServiceOperations.asn
+++ b/asn1/gsm_map/MAP-MobileServiceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.4.0 V8.9.0 (2009-04)
+-- 3GPP TS 29.002 V8.4.0 V9.0.0 (2009-12)
 -- 17.6.1	Mobile Service Operations
 
 MAP-MobileServiceOperations {
@@ -509,4 +509,3 @@ noteMM-Event  OPERATION ::= {				--Timer m
 	CODE	local:89 }
 
 END
-
diff --git a/asn1/gsm_map/MAP-OM-DataTypes.asn b/asn1/gsm_map/MAP-OM-DataTypes.asn
index 0c17863aef..eef88a61bb 100644
--- a/asn1/gsm_map/MAP-OM-DataTypes.asn
+++ b/asn1/gsm_map/MAP-OM-DataTypes.asn
@@ -1,6 +1,6 @@
 -- $Id$
 -- 17.7.2	Operation and maintenance data types
--- 3GPP TS 29.002 V8.9.0 (2009-04)
+-- 3GPP TS 29.002 V9.0.0 (2009-12)
  
 MAP-OM-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
@@ -24,7 +24,8 @@ EXPORTS
 
 IMPORTS
 	AddressString,
-	IMSI
+	IMSI,
+	GSN-Address
 FROM MAP-CommonDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-CommonDataTypes (18) version11 (11)}
@@ -47,7 +48,8 @@ ActivateTraceModeArg ::= SEQUENCE {
 	traceDepthList	[6] TraceDepthList	OPTIONAL,
 	traceNE-TypeList	[7] TraceNE-TypeList	OPTIONAL,
 	traceInterfaceList	[8] TraceInterfaceList	OPTIONAL,
-	traceEventList	[9] TraceEventList	OPTIONAL
+	traceEventList	[9] TraceEventList	OPTIONAL,
+	traceCollectionEntity	[10] GSN-Address	OPTIONAL
 	}
 
 TraceReference ::= OCTET STRING (SIZE (1..2))
@@ -67,7 +69,11 @@ TraceDepthList ::= SEQUENCE {
 	ggsn-TraceDepth	[3] TraceDepth	OPTIONAL,
 	rnc-TraceDepth	[4] TraceDepth	OPTIONAL,
 	bmsc-TraceDepth	[5] TraceDepth	OPTIONAL,
-	...}
+	... ,
+	mme-TraceDepth	[6] TraceDepth	OPTIONAL,
+	sgw-TraceDepth	[7] TraceDepth	OPTIONAL,
+	pgw-TraceDepth	[8] TraceDepth	OPTIONAL,
+	eNB-TraceDepth	[9] TraceDepth	OPTIONAL }
 
 TraceDepth ::= ENUMERATED {
 	minimum (0),
@@ -83,7 +89,11 @@ TraceNE-TypeList ::= BIT STRING {
 	sgsn (2),
 	ggsn (3),
 	rnc (4),
-	bm-sc (5)} (SIZE (6..16))
+	bm-sc (5) ,
+	mme (6),
+	sgw (7),
+	pgw (8),
+	eNB (9)} (SIZE (6..16))
 -- Other bits than listed above shall be discarded.
 
 TraceInterfaceList ::= SEQUENCE {
@@ -93,7 +103,11 @@ TraceInterfaceList ::= SEQUENCE {
 	ggsn-List		[3] GGSN-InterfaceList	OPTIONAL,
 	rnc-List		[4] RNC-InterfaceList	OPTIONAL,
 	bmsc-List		[5] BMSC-InterfaceList	OPTIONAL,
-	...}
+	...,
+	mme-List		[6] MME-InterfaceList	OPTIONAL,
+	sgw-List		[7] SGW-InterfaceList	OPTIONAL,
+	pgw-List		[8] PGW-InterfaceList	OPTIONAL,
+	eNB-List		[9] ENB-InterfaceList	OPTIONAL}
 
 MSC-S-InterfaceList ::= BIT STRING {
 	a (0),
@@ -122,7 +136,10 @@ SGSN-InterfaceList ::= BIT STRING {
 	map-gd (4),
 	map-gf (5),
 	gs (6),
-	ge (7)} (SIZE (8..16))
+	ge (7),
+	s3 (8),
+	s4 (9),
+	s6d (10)} (SIZE (8..16))
 -- Other bits than listed above shall be discarded.
 
 GGSN-InterfaceList ::= BIT STRING {
@@ -142,13 +159,49 @@ BMSC-InterfaceList ::= BIT STRING {
 	gmb (0)} (SIZE (1..8))
 -- Other bits than listed above shall be discarded.
 
+MME-InterfaceList ::= BIT STRING {
+	s1-mme (0),
+	s3 (1),
+	s6a (2),
+	s10 (3),
+	s11 (4)} (SIZE (5..8))
+-- Other bits than listed above shall be discarded.
+
+SGW-InterfaceList ::= BIT STRING {
+	s4 (0),
+	s5 (1),
+	s8b (2),
+	s11 (3),
+	gxc (4)} (SIZE (5..8))
+-- Other bits than listed above shall be discarded.
+
+PGW-InterfaceList ::= BIT STRING {
+	s2a (0),
+	s2b (1),
+	s2c (2),
+	s5 (3),
+	s6b (4),
+	gx (5),
+	s8b (6),
+	sgi (7)} (SIZE (8..16))
+-- Other bits than listed above shall be discarded.
+
+ENB-InterfaceList ::= BIT STRING {
+	s1-mme (0),
+	x2 (1),
+	uu (2)} (SIZE (3..8))
+-- Other bits than listed above shall be discarded.
+
 TraceEventList ::= SEQUENCE {
 	msc-s-List	[0] MSC-S-EventList	OPTIONAL,
 	mgw-List		[1] MGW-EventList	OPTIONAL,
 	sgsn-List		[2] SGSN-EventList	OPTIONAL,
 	ggsn-List		[3] GGSN-EventList	OPTIONAL,
 	bmsc-List		[4] BMSC-EventList	OPTIONAL,
-	...}
+	...,
+	mme-List		[5] MME-EventList	OPTIONAL,
+	sgw-List		[6] SGW-EventList	OPTIONAL,
+	pgw-List		[7] PGW-EventList	OPTIONAL}
 
 MSC-S-EventList ::= BIT STRING {
 	mo-mtCall (0),
@@ -178,6 +231,26 @@ BMSC-EventList ::= BIT STRING {
 	mbmsMulticastServiceActivation (0)} (SIZE (1..8))
 -- Other bits than listed above shall be discarded.
 
+MME-EventList ::= BIT STRING {
+	ue-initiatedPDNconectivityRequest (0),
+	serviceRequestts (1),
+	initialAttachTrackingAreaUpdateDetach (2),
+	ue-initiatedPDNdisconnection (3),
+	bearerActivationModificationDeletion (4),
+	handover (5)} (SIZE (6..8))
+-- Other bits than listed above shall be discarded.
+
+SGW-EventList ::= BIT STRING {
+	pdn-connectionCreation (0),
+	pdn-connectionTermination (1),
+	bearerActivationModificationDeletion (2)} (SIZE (3..8))
+-- Other bits than listed above shall be discarded.
+
+PGW-EventList ::= BIT STRING {
+	pdn-connectionCreation (0),
+	pdn-connectionTermination (1),
+	bearerActivationModificationDeletion (2)} (SIZE (3..8))
+-- Other bits than listed above shall be discarded.
 
 TracePropagationList ::= SEQUENCE {
 	traceReference	[0] TraceReference	OPTIONAL,
@@ -213,4 +286,3 @@ DeactivateTraceModeRes ::= SEQUENCE {
 	...}
 
 END
-
diff --git a/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn b/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn
index e964aedf63..30e271c686 100644
--- a/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn
+++ b/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04) 
+-- 3GPP TS 29.002 V9.0.0 (2009-12) 
 --17.6.2	Operation and Maintenance Operations
 MAP-OperationAndMaintenanceOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
@@ -92,4 +92,3 @@ sendIMSI  OPERATION ::= {				--Timer m
 	CODE	local:58 }
 
 END
-
diff --git a/asn1/gsm_map/MAP-Protocol.asn b/asn1/gsm_map/MAP-Protocol.asn
index 598ff3a55e..041dcbe205 100644
--- a/asn1/gsm_map/MAP-Protocol.asn
+++ b/asn1/gsm_map/MAP-Protocol.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.4.0 V8.9.0 (2009-04)
+-- 3GPP TS 29.002 V9.0.0 (2009-12)
 --17.5	MAP operation and error codes
 MAP-Protocol {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
@@ -171,4 +171,3 @@ releaseResources | mt-ForwardSM-VGCS | sendGroupCallInfo }
 
 
 END
-
diff --git a/asn1/gsm_map/MAP-SM-DataTypes.asn b/asn1/gsm_map/MAP-SM-DataTypes.asn
index a647ae33b1..b801d019e4 100644
--- a/asn1/gsm_map/MAP-SM-DataTypes.asn
+++ b/asn1/gsm_map/MAP-SM-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002  V8.9.0 (2009-04)  
+-- 3GPP TS 29.002  V9.0.0 (2009-12)  
 -- 17.7.6	Short message data types
 
 MAP-SM-DataTypes {
diff --git a/asn1/gsm_map/MAP-SS-Code.asn b/asn1/gsm_map/MAP-SS-Code.asn
index 00e12f2ade..ce64d47a78 100644
--- a/asn1/gsm_map/MAP-SS-Code.asn
+++ b/asn1/gsm_map/MAP-SS-Code.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04)
+-- 3GPP TS 29.002 V9.0.0 (2009-12)
 -- 17.7.5	Supplementary service codes
 
 MAP-SS-Code {
@@ -187,4 +187,3 @@ transferToThirdParty	SS-Code ::= '11000011'B
 	-- allow an MS to request transfer of its location to another LCS client
 
 END
-
diff --git a/asn1/gsm_map/MAP-SS-DataTypes.asn b/asn1/gsm_map/MAP-SS-DataTypes.asn
index d3b3253390..ec7d6b44cd 100644
--- a/asn1/gsm_map/MAP-SS-DataTypes.asn
+++ b/asn1/gsm_map/MAP-SS-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04)  
+-- 3GPP TS 29.002 V9.0.0 (2009-12)  
 -- 17.7.4	Supplementary service data types
  
 MAP-SS-DataTypes {
@@ -339,4 +339,3 @@ EraseCC-EntryRes ::= SEQUENCE {
 	...}
 
 END
-
diff --git a/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn b/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn
index 36f59c08bd..bf63e4c38a 100644
--- a/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn
+++ b/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04)  
+-- 3GPP TS 29.002 V9.0.0 (2009-12)  
 -- 17.6.5	Short message service operations
  
 MAP-ShortMessageServiceOperations {
@@ -170,5 +170,3 @@ mt-ForwardSM-VGCS  OPERATION ::= {				--Timer ml
 
 
 END
-
-
diff --git a/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn b/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn
index e2e1a52348..2d00ee4b89 100644
--- a/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn
+++ b/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04)  
+-- 3GPP TS 29.002 V9.0.0 (2009-12)  
 --17.6.4	Supplementary service operations
 
 MAP-SupplementaryServiceOperations {
@@ -297,4 +297,3 @@ eraseCC-Entry  OPERATION ::= {				--Timer m
 	CODE	local:77 }
 
 END
-
diff --git a/asn1/gsm_map/MAP-TS-Code.asn b/asn1/gsm_map/MAP-TS-Code.asn
index 0900f9f9e5..961a3417d9 100644
--- a/asn1/gsm_map/MAP-TS-Code.asn
+++ b/asn1/gsm_map/MAP-TS-Code.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.9.0 (2009-04) 
+-- 3GPP TS 29.002 V9.0.0 (2009-12) 
 -- 17.7.9	Teleservice Codes
  
 MAP-TS-Code {
@@ -89,4 +89,3 @@ plmn-specificTS-E	TeleserviceCode ::= '11011110'B
 plmn-specificTS-F	TeleserviceCode ::= '11011111'B
 
 END
-
diff --git a/asn1/gsm_map/SS-DataTypes.asn b/asn1/gsm_map/SS-DataTypes.asn
index 03c8198dc0..49c1c9567b 100644
--- a/asn1/gsm_map/SS-DataTypes.asn
+++ b/asn1/gsm_map/SS-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 24.080 V7.4.0 (2007-09)
+-- 3GPP TS 24.080 V9.0.0 (2009-12)
 -- 4.4.2	ASN.1 data types
 SS-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3)
@@ -27,7 +27,7 @@ FROM MAP-SS-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3)
    map-SS-DataTypes (14) version10 (10)}
 
-GSN-Address,
+-- GSN-Address, WS fix, fault in spec this is now in CommonDataTypes
 CUG-Index,
 NotificationToMSUser
 FROM MAP-MS-DataTypes {
@@ -38,11 +38,12 @@ maxSignalInfoLength,
 ISDN-AddressString,
 ISDN-SubaddressString,
 AlertingPattern,
-IMSI,
 LCSClientExternalID,
 AddressString,
 LCSServiceTypeID,
-AgeOfLocationInformation
+AgeOfLocationInformation,
+GSN-Address -- WS fix
+
 FROM MAP-CommonDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3)
    map-CommonDataTypes (18) version10 (10)}
@@ -91,13 +92,6 @@ NotifySS-Arg ::= SEQUENCE{
 	alertingPattern				[22]	AlertingPattern OPTIONAL,
 	multicall-Indicator			[23]	Multicall-Indicator OPTIONAL}
 
-
-BeginSubscriberActivityArg ::= SEQUENCE {
-    imsi            IMSI,
-    originatingEntityNumber ISDN-AddressString,
-    msisdn                  [PRIVATE 28] AddressString OPTIONAL,
-    ... }
-
 --  The nameIndicator is defined because of CNAP.
 
 Multicall-Indicator	::= ENUMERATED {
diff --git a/asn1/gsm_map/SS-Errors.asn b/asn1/gsm_map/SS-Errors.asn
index 2aa4358191..233d363fcb 100644
--- a/asn1/gsm_map/SS-Errors.asn
+++ b/asn1/gsm_map/SS-Errors.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 24.080 V7.4.0 (2007-09)
+-- 3GPP TS 24.080 V9.0.0 (2009-12)
 -- 4.3.1	Errors ASN.1 specification
 -- The following ASN.1 module provides an ASN.1 specification of errors. Errors from MAP are imported in the SS Protocol module in subclause 4.5. The module defines errors by allocating them a local value. For the involved errors the same local values as in MAP are allocated.
 
diff --git a/asn1/gsm_map/SS-Operations.asn b/asn1/gsm_map/SS-Operations.asn
index 0150c2cdae..9003c91a15 100644
--- a/asn1/gsm_map/SS-Operations.asn
+++ b/asn1/gsm_map/SS-Operations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 24.080 V7.4.0 (2007-09)
+-- 3GPP TS 24.080 V9.0.0 (2009-12)
 -- 4.2	Operation types
 SS-Operations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3)
@@ -14,7 +14,7 @@ EXPORTS
 -- exports operations
 
 -- operations defined in this specification
-processUnstructuredSS-Data, beginSubscriberActivity, notifySS, forwardChargeAdvice, forwardCUG-Info, buildMPTY, holdMPTY, retrieveMPTY, splitMPTY, explicitCT, accessRegisterCCEntry, callDeflection, userUserService,
+processUnstructuredSS-Data, notifySS, forwardChargeAdvice, forwardCUG-Info, buildMPTY, holdMPTY, retrieveMPTY, splitMPTY, explicitCT, accessRegisterCCEntry, callDeflection, userUserService,
 lcs-LocationNotification, lcs-MOLR, lcs-AreaEventRequest, lcs-AreaEventReport, lcs-AreaEventCancellation, lcs-PeriodicLocationRequest, lcs-LocationUpdate, lcs-PeriodicLocationCancellation;
 
 IMPORTS
@@ -32,7 +32,6 @@ Remote-Operations-Information-Objects {
 
 -- imports SS-data types
 NotifySS-Arg,
-BeginSubscriberActivityArg,
 ForwardChargeAdviceArg,
 ForwardCUG-InfoArg,
 SS-UserData,
@@ -88,10 +87,6 @@ processUnstructuredSS-Data	OPERATION ::= { -- Timer T(PUSSD)= 15s to 30s
 				unexpectedDataValue}
 	CODE		local:19 }
 
-beginSubscriberActivity      OPERATION ::= {
-        ARGUMENT         BeginSubscriberActivityArg
-        CODE            local:54 }
-
 notifySS 	OPERATION ::= {
 	ARGUMENT	NotifySS-Arg
 	CODE		local:16 }
diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c
index 94ee779204..5ca1375cb1 100644
--- a/asn1/gsm_map/packet-gsm_map-template.c
+++ b/asn1/gsm_map/packet-gsm_map-template.c
@@ -12,7 +12,7 @@
 /* packet-gsm_map-template.c
  * Routines for GSM MobileApplication packet dissection
  * including GSM SS.
- * Copyright 2004 - 2009 , Anders Broman <anders.broman [AT] ericsson.com>
+ * Copyright 2004 - 2010 , Anders Broman <anders.broman [AT] ericsson.com>
  * Based on the dissector by:
  * Felix Fei <felix.fei [AT] utstar.com>
  * and Michael Lum <mlum [AT] telostech.com>
@@ -1077,7 +1077,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
     /* reserved traceSubscriberActivity (52) */
     /* undefined 53 */
   case 54: /*beginSubscriberActivity*/
-    offset=dissect_gsm_ss_BeginSubscriberActivityArg(FALSE, tvb, offset, actx, tree, -1);
+    offset=dissect_gsm_old_BeginSubscriberActivityArg(FALSE, tvb, offset, actx, tree, -1);
     break;
   case 55: /*sendIdentification*/
     offset=dissect_mc_message(tvb, offset, actx, tree,