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

openair2/NETWORK_DRIVER/MESH/classifier.c

@@ -597,7 +597,7 @@ void nas_CLASS_send(struct sk_buff *skb,int inst) {
 #ifdef NAS_DEBUG_SEND
   printk("[NAS][CLASS][SEND] Got packet from kernel:\n");
 
-  for (i=0; i<256; i++)
+  for (int i=0; i<256; i++)
     printk("%2x ",((unsigned char *)skb->data)[i]);
 
   printk("\n");

openair2/NETWORK_DRIVER/MESH/common.c

@@ -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

openair2/NETWORK_DRIVER/MESH/netlink.c

@@ -161,7 +161,7 @@ int nas_netlink_send(unsigned char *data,unsigned int len)
   int status;
 
 
-  //  printk("[NAS][NETLINK] Sending %d bytes (%d)\n",len,NLMSG_SPACE(len));
+    //printk("[NAS][NETLINK] Sending %d bytes (%d)\n",len,NLMSG_SPACE(len));
   skb_put(nl_skb, NLMSG_SPACE(len));
   memcpy(NLMSG_DATA(nlh),data,len);