Commit d177da7c authored by canterburym's avatar canterburym
Browse files

Adding missing commas

parent 42218818
Loading
Loading
Loading
Loading
Loading
+16 −43
Original line number Diff line number Diff line
@@ -1308,15 +1308,12 @@ SMFPDUSessionEstablishment ::= SEQUENCE
    sMPDUDNRequest              [18] SMPDUDNRequest OPTIONAL,
    uEEPSPDNConnection          [19] UEEPSPDNConnection OPTIONAL,
    ePS5GSComboInfo             [20] EPS5GSComboInfo OPTIONAL,
<<<<<<< HEAD
    selectedDNN                 [21] DNN OPTIONAL,
    servingNetwork              [22] SMFServingNetwork OPTIONAL,
    oldPDUSessionID             [23] PDUSessionID OPTIONAL,
    handoverState               [24] HandoverState OPTIONAL,
    gTPTunnelInfo               [25] GTPTunnelInfo
=======
    pCCRules                    [21] PCCRuleSet OPTIONAL
>>>>>>> cr/33128/0352_alt
    gTPTunnelInfo               [25] GTPTunnelInfo,
    pCCRules                    [26] PCCRuleSet OPTIONAL
}

-- See clause 6.2.3.2.3 for details of this structure
@@ -1334,14 +1331,11 @@ SMFPDUSessionModification ::= SEQUENCE
    rATType                     [10] RATType OPTIONAL,
    pDUSessionID                [11] PDUSessionID OPTIONAL,
    ePS5GSComboInfo             [12] EPS5GSComboInfo OPTIONAL,
<<<<<<< HEAD
    uEEndpoint                  [13] UEEndpointAddress OPTIONAL,
    servingNetwork              [14] SMFServingNetwork OPTIONAL,
    handoverState               [15] HandoverState OPTIONAL,
    gTPTunnelInfo               [16] GTPTunnelInfo
=======
    pCCRules                    [13] PCCRuleSet OPTIONAL
>>>>>>> cr/33128/0352_alt
    gTPTunnelInfo               [16] GTPTunnelInfo,
    pCCRules                    [17] PCCRuleSet OPTIONAL
}

-- See clause 6.2.3.2.4 for details of this structure
@@ -1358,12 +1352,9 @@ SMFPDUSessionRelease ::= SEQUENCE
    location                    [9] Location OPTIONAL,
    cause                       [10] SMFErrorCodes OPTIONAL,
    ePS5GSComboInfo             [11] EPS5GSComboInfo OPTIONAL,
<<<<<<< HEAD
    nGAPCause                   [12] NGAPCauseInt OPTIONAL,
    fiveGMMCause                [13] FiveGMMCause OPTIONAL
=======
    pCCRuleIDs                  [12] PCCRuleIDSet OPTIONAL
>>>>>>> cr/33128/0352_alt
    fiveGMMCause                [13] FiveGMMCause OPTIONAL,
    pCCRuleIDs                  [14] PCCRuleIDSet OPTIONAL
}

-- See clause 6.2.3.2.5 for details of this structure
@@ -1389,13 +1380,10 @@ SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE
    sMPDUDNRequest              [18] SMPDUDNRequest OPTIONAL,
    timeOfSessionEstablishment  [19] Timestamp OPTIONAL,
    ePS5GSComboInfo             [20] EPS5GSComboInfo OPTIONAL,
<<<<<<< HEAD
    uEEPSPDNConnection          [21] UEEPSPDNConnection OPTIONAL,
    servingNetwork              [22] SMFServingNetwork OPTIONAL,
    gTPTunnelInfo               [23] GTPTunnelInfo
=======
    pCCRules                    [21] PCCRuleSet OPTIONAL
>>>>>>> cr/33128/0352_alt
    gTPTunnelInfo               [23] GTPTunnelInfo,
    pCCRules                    [24] PCCRuleSet OPTIONAL
}

-- See clause 6.2.3.2.6 for details of this structure
@@ -1468,14 +1456,11 @@ SMFMAPDUSessionEstablishment ::= SEQUENCE
    ePSPDNCnxInfo               [19] SMFEPSPDNCnxInfo OPTIONAL,
    mAAcceptedIndication        [20] SMFMAAcceptedIndication,
    aTSSSContainer              [21] ATSSSContainer OPTIONAL,
<<<<<<< HEAD
    uEEPSPDNConnection          [22] UEEPSPDNConnection OPTIONAL,
    ePS5GSComboInfo             [23] EPS5GSComboInfo OPTIONAL,
    selectedDNN                 [24] DNN OPTIONAL,
    handoverState               [25] HandoverState OPTIONAL
=======
    pCCRules                    [22] PCCRuleSet OPTIONAL
>>>>>>> cr/33128/0352_alt
    handoverState               [25] HandoverState OPTIONAL,
    pCCRules                    [26] PCCRuleSet OPTIONAL
}

-- See clause 6.2.3.2.7.2 for details of this structure
@@ -1496,13 +1481,10 @@ SMFMAPDUSessionModification ::= SEQUENCE
    ePSPDNCnxInfo               [13] SMFEPSPDNCnxInfo OPTIONAL,
    mAAcceptedIndication        [14] SMFMAAcceptedIndication,
    aTSSSContainer              [15] ATSSSContainer OPTIONAL,
<<<<<<< HEAD
    uEEPSPDNConnection          [16] UEEPSPDNConnection OPTIONAL,
    ePS5GSComboInfo             [17] EPS5GSComboInfo OPTIONAL,
    handoverState               [18] HandoverState OPTIONAL
=======
    pCCRules                    [16] PCCRuleSet OPTIONAL
>>>>>>> cr/33128/0352_alt
    handoverState               [18] HandoverState OPTIONAL,
    pCCRules                    [19] PCCRuleSet OPTIONAL
}

-- See clause 6.2.3.2.7.3 for details of this structure
@@ -1518,12 +1500,9 @@ SMFMAPDUSessionRelease ::= SEQUENCE
    downlinkVolume              [8] INTEGER OPTIONAL,
    location                    [9] Location OPTIONAL,
    cause                       [10] SMFErrorCodes OPTIONAL,
<<<<<<< HEAD
    nGAPCause                   [11] NGAPCauseInt OPTIONAL,
    fiveGMMCause                [12] FiveGMMCause OPTIONAL
=======
    pCCRuleIDs                  [11] PCCRuleIDSet OPTIONAL
>>>>>>> cr/33128/0352_alt
    fiveGMMCause                [12] FiveGMMCause OPTIONAL,
    pCCRuleIDs                  [13] PCCRuleIDSet OPTIONAL
}

-- See clause 6.2.3.2.7.4 for details of this structure
@@ -1550,12 +1529,9 @@ SMFStartOfInterceptionWithEstablishedMAPDUSession ::= SEQUENCE
    ePSPDNCnxInfo               [19] SMFEPSPDNCnxInfo OPTIONAL,
    mAAcceptedIndication        [20] SMFMAAcceptedIndication,
    aTSSSContainer              [21] ATSSSContainer OPTIONAL,
<<<<<<< HEAD
    ePS5GSComboInfo             [22] EPS5GSComboInfo OPTIONAL,
    uEEPSPDNConnection          [23] UEEPSPDNConnection OPTIONAL
=======
    pCCRules                    [22] PCCRuleSet OPTIONAL
>>>>>>> cr/33128/0352_alt
    uEEPSPDNConnection          [23] UEEPSPDNConnection OPTIONAL,
    pCCRules                    [24] PCCRuleSet OPTIONAL
}

-- See clause 6.2.3.2.7.5 for details of this structure
@@ -1685,7 +1661,6 @@ RequestIndication ::= ENUMERATED
    rELDUETO5GANREQUEST(7)
}

<<<<<<< HEAD
QOSFlowTunnelInformation ::= SEQUENCE
{
    uPTunnelInformation   [1] FTEID,
@@ -1715,7 +1690,6 @@ QOSFlowProfile ::= SEQUENCE
}

QOSRules ::= OCTET STRING
=======
--see Clauses 5.6.2.6-1 and 5.6.2.9-1 of TS 29.512[YY], clause table 5.6.2.5-1 of TS 29.508[ZZ] for the details of this structure.
PCCRule ::= SEQUENCE
{
@@ -1868,7 +1842,6 @@ EASServerAddress ::= SEQUENCE
    iPAddress        [1]  IPAddress,
    port             [2]  PortNumber
}
>>>>>>> cr/33128/0352_alt

-- ======================
-- PGW-C + SMF Parameters