equal
deleted
inserted
replaced
160 /** |
160 /** |
161 * MAC SAP |
161 * MAC SAP |
162 */ |
162 */ |
163 |
163 |
164 void |
164 void |
165 LteRlcAm::DoNotifyTxOpportunity (uint32_t bytes, uint8_t layer) |
165 LteRlcAm::DoNotifyTxOpportunity (uint32_t bytes, uint8_t layer, uint8_t harqId) |
166 { |
166 { |
167 NS_LOG_FUNCTION (this << m_rnti << (uint32_t) m_lcid << bytes); |
167 NS_LOG_FUNCTION (this << m_rnti << (uint32_t) m_lcid << bytes); |
168 |
168 |
169 if (bytes <= 2) |
169 if (bytes <= 2) |
170 { |
170 { |
188 // Send RLC PDU to MAC layer |
188 // Send RLC PDU to MAC layer |
189 LteMacSapProvider::TransmitPduParameters params; |
189 LteMacSapProvider::TransmitPduParameters params; |
190 params.pdu = packet; |
190 params.pdu = packet; |
191 params.rnti = m_rnti; |
191 params.rnti = m_rnti; |
192 params.lcid = m_lcid; |
192 params.lcid = m_lcid; |
|
193 params.layer = layer; |
|
194 params.harqProcessId = harqId; |
193 |
195 |
194 m_macSapProvider->TransmitPdu (params); |
196 m_macSapProvider->TransmitPdu (params); |
195 return; |
197 return; |
196 } |
198 } |
197 else if ( m_retxBufferSize > 0 ) |
199 else if ( m_retxBufferSize > 0 ) |
209 // Send RLC PDU to MAC layer |
211 // Send RLC PDU to MAC layer |
210 LteMacSapProvider::TransmitPduParameters params; |
212 LteMacSapProvider::TransmitPduParameters params; |
211 params.pdu = packet; |
213 params.pdu = packet; |
212 params.rnti = m_rnti; |
214 params.rnti = m_rnti; |
213 params.lcid = m_lcid; |
215 params.lcid = m_lcid; |
|
216 params.layer = layer; |
|
217 params.harqProcessId = harqId; |
214 |
218 |
215 m_macSapProvider->TransmitPdu (params); |
219 m_macSapProvider->TransmitPdu (params); |
216 return; |
220 return; |
217 } |
221 } |
218 else |
222 else |
537 LteMacSapProvider::TransmitPduParameters params; |
541 LteMacSapProvider::TransmitPduParameters params; |
538 params.pdu = packet; |
542 params.pdu = packet; |
539 params.rnti = m_rnti; |
543 params.rnti = m_rnti; |
540 params.lcid = m_lcid; |
544 params.lcid = m_lcid; |
541 params.layer = layer; |
545 params.layer = layer; |
|
546 params.harqProcessId = harqId; |
542 |
547 |
543 m_macSapProvider->TransmitPdu (params); |
548 m_macSapProvider->TransmitPdu (params); |
544 } |
549 } |
545 |
550 |
546 void |
551 void |