Commit 03466be1 authored by Jerediah Fevold's avatar Jerediah Fevold
Browse files

Merging NR_UAV-core_R2_125_RIL_L004. Resolved merge conflict caused due to an... 

Merging NR_UAV-core_R2_125_RIL_L004. Resolved merge conflict caused due to an incompatibility with a previous change. In this case, uav had already been modified to aerial, so the change which removed a field from being singaled in other config for SCG couldn't apply since the original reference was gone.
parents 011c8ed7 52c4685f

38331-i00.md

+1 −1
Original line number Diff line number Diff line
@@ -27543,7 +27543,7 @@ Editor\'s Note: FFS whether/how to indicate PC5 release/maintain for indirect pa 
| ***nextHopChainingCount***<br />Parameter NCC: See TS 33.501 \[11\] |

| ***onDemandSIB-Request***<br />If the field is present, the UE is allowed to request SIB(s) on-demand while in RRC_CONNECTED according to clause 5.2.2.3.5. |

| ***onDemandSIB-RequestProhibitTimer***<br />Prohibit timer for requesting SIB(s) on-demand while in RRC_CONNECTED according to clause 5.2.2.3.5. Value in seconds. Value s0 means prohibit timer is set to 0 seconds, value s0dot5 means prohibit timer is set to 0.5 seconds, value s1 means prohibit timer is set to 1 second and so on. |

| ***otherConfig***<br />Contains configuration related to other configurations. When configured for the SCG, only fields *drx-PreferenceConfig, maxBW-PreferenceConfig, maxBW-PreferenceConfigFR2-2, maxCC-PreferenceConfig, maxMIMO-LayerPreferenceConfig*, *maxMIMO-LayerPreferenceConfigFR2-2*, *minSchedulingOffsetPreferenceConfig, minSchedulingOffsetPreferenceConfigExt, rlm-RelaxationReportingConfig, bfd-RelaxationReportingConfig, btNameList, wlanNameList, sensorNameList*, *obtainCommonLocation* and *aerial-FlightPathAvailabilityConfig* can be included. |

| ***otherConfig***<br />Contains configuration related to other configurations. When configured for the SCG, only fields *drx-PreferenceConfig, maxBW-PreferenceConfig, maxBW-PreferenceConfigFR2-2, maxCC-PreferenceConfig, maxMIMO-LayerPreferenceConfig*, *maxMIMO-LayerPreferenceConfigFR2-2*, *minSchedulingOffsetPreferenceConfig, minSchedulingOffsetPreferenceConfigExt, rlm-RelaxationReportingConfig, bfd-RelaxationReportingConfig, btNameList, wlanNameList, sensorNameList*, and *obtainCommonLocation* can be included. |

| ***radioBearerConfig***<br />Configuration of Radio Bearers (DRBs, SRBs, multicast MRBs) including SDAP/PDCP. In (NG)EN-DC this field may only be present if the *RRCReconfiguration* is transmitted over SRB3. SRB4 should not be configured if *sl-L2RemoteUE-Config-r17* is configured or not released. |

| ***radioBearerConfig2***<br />Configuration of Radio Bearers (DRBs, SRBs) including SDAP/PDCP. This field can only be used if the UE supports NR-DC or NE-DC. |

| ***scg-State***<br />Indicates that the SCG is in deactivated state.<br />This field is not used<br />The field is absent if CPA or CPC is configured for the UE, or if the *RRCReconfiguration* message is contained in *CondRRCReconfig,* or PSCell is configured with *tag2*. |