Merge remote-tracking branch 'origin/nr-ip-over-LTE-stack' into integration_develop-nr_2019w42

Conflicts: executables/nr-softmodem.c executables/nr-softmodem.h targets/ARCH/rfsimulator/simulator.c
2019-10-14 13:40:03 +02:00
parent a5af01633a 054eaf66a6
commit c046eb66a6
32 changed files with 1146 additions and 232 deletions
@@ -386,6 +386,11 @@ void nas_COMMON_QOS_send(struct sk_buff *skb, struct cx_entity *cx, struct class
  pdcph.data_size  = skb->len;
  pdcph.rb_id      = (gc->rb)->rab_id;
  pdcph.inst       = inst;
+#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
+  pdcph.sourceL2Id = 0;
+  pdcph.destinationL2Id = 0;
+#endif
+


 #ifdef PDCP_USE_NETLINK