diff --git a/openair2/NAS/DRIVER/MESH/common.c b/openair2/NAS/DRIVER/MESH/common.c index 43b9704dc2d2fba2c5541846ba0630baf0b494a0..eb3e8b2ce1c742b628f4f86ecd7307393692e861 100755 --- a/openair2/NAS/DRIVER/MESH/common.c +++ b/openair2/NAS/DRIVER/MESH/common.c @@ -97,7 +97,7 @@ void nas_COMMON_receive(u16 dlen, skb->dev = nasdev[inst]; #ifdef KERNEL_VERSION_GREATER_THAN_2622 - skb->mac_header = skb->data; + skb_reset_mac_header(skb); #else skb->mac.raw = skb->data; #endif @@ -119,7 +119,7 @@ void nas_COMMON_receive(u16 dlen, #ifdef KERNEL_VERSION_GREATER_THAN_2622 - skb->network_header = skb->data; + skb_reset_network_header(skb); #else skb->nh.ipv6h = (struct ipv6hdr *)skb->data; #endif @@ -175,10 +175,9 @@ void nas_COMMON_receive(u16 dlen, #endif #ifdef KERNEL_VERSION_GREATER_THAN_2622 - skb->network_header = skb->data; - network_header = (struct iphdr *)skb_network_header(skb); - protocol = network_header->protocol; - + skb_reset_network_header(skb); + network_header = (struct iphdr *)skb_network_header(skb); + protocol = network_header->protocol; #else skb->nh.iph = (struct iphdr *)skb->data; protocol=skb->nh.iph->protocol; @@ -435,7 +434,7 @@ void nas_COMMON_QOS_send(struct sk_buff *skb, struct cx_entity *cx, struct class if (bytes_wrote != NAS_PDCPH_SIZE) { printk("NAS_COMMON_QOS_SEND: problem while writing PDCP's header (bytes wrote = %d to fifo %d)\n",bytes_wrote,NAS2PDCP_FIFO); - printk("rb_id %d, Wrote %d, Header Size %d \n", pdcph.rb_id , bytes_wrote, NAS_PDCPH_SIZE); + printk("rb_id %d, Wrote %d, Header Size %lu\n", pdcph.rb_id , bytes_wrote, NAS_PDCPH_SIZE); #ifndef NAS_NETLINK rtf_reset(NAS2PDCP_FIFO); #endif //NAS_NETLINK @@ -449,7 +448,7 @@ void nas_COMMON_QOS_send(struct sk_buff *skb, struct cx_entity *cx, struct class if (bytes_wrote != skb->len+NAS_PDCPH_SIZE) { - printk("NAS_COMMON_QOS_SEND: Inst %d, RB_ID %d: problem while writing PDCP's data, bytes_wrote = %d, Data_len %d, PDCPH_SIZE %d\n", + printk("NAS_COMMON_QOS_SEND: Inst %d, RB_ID %d: problem while writing PDCP's data, bytes_wrote = %d, Data_len %d, PDCPH_SIZE %lu\n", inst, pdcph.rb_id, bytes_wrote, diff --git a/openair2/NAS/DRIVER/MESH/ioctl.c b/openair2/NAS/DRIVER/MESH/ioctl.c index e50773176f45cc576796188a6905819e5629870f..86e8142f40bf44d6dbb4c147a5208099cbb645a7 100755 --- a/openair2/NAS/DRIVER/MESH/ioctl.c +++ b/openair2/NAS/DRIVER/MESH/ioctl.c @@ -556,7 +556,7 @@ int nas_ioCTL_class_add_request(struct nas_ioctl *gifr, printk("NAS_IOCTL_CLASS_ADD: Add classifier components requested\n"); - printk("NAS_IOCTL_CLASS_ADD: size of gifr msg %d\n", sizeof(gifr->msg)); + printk("NAS_IOCTL_CLASS_ADD: size of gifr msg %zd\n", sizeof(gifr->msg)); if (copy_from_user(&msgreq, gifr->msg, sizeof(msgreq))){ diff --git a/openair2/NAS/DRIVER/MESH/tool.c b/openair2/NAS/DRIVER/MESH/tool.c index a541e621ffeb7f09929feb396340826180418b0f..8eb7956a69c2776cffbbe0d01f0444b7f749f2ec 100755 --- a/openair2/NAS/DRIVER/MESH/tool.c +++ b/openair2/NAS/DRIVER/MESH/tool.c @@ -564,7 +564,7 @@ void print_TOOL_pk_ipv4(struct iphdr *iph){ //--------------------------------------------------------------------------- void print_TOOL_pk_all(struct sk_buff *skb){ //--------------------------------------------------------------------------- - printk("Skb:\t %u, len = %u\n", (unsigned int)skb, skb->len); + printk("Skb:\t %p, len = %u\n", skb, skb->len); #ifdef KERNEL_VERSION_GREATER_THAN_2629 //navid: need to calculate the current used space: fixme? printk("Skb:\t available buf space = %u \n", skb->truesize);