Merge "Inline skb_frag_add_head in 4.3 later kernels." into R3.1

Juniper · Jul 31, 2016 · 8887405 · 8887405
2 parents 24cf44f + 97e923f
commit 8887405
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/linux/vrouter_mod.c b/linux/vrouter_mod.c
@@ -224,7 +224,12 @@ lh_palloc_head(struct vr_packet *pkt, unsigned int size)
     npkt->vp_type = pkt->vp_type;
 
     skb_frag_list_init(skb_head);
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(4,3,0))
     skb_frag_add_head(skb_head, skb);
+#else
+    skb->next = skb_shinfo(skb_head)->frag_list;
+    skb_shinfo(skb_head)->frag_list = skb;
+#endif
     skb_head->len += skb->len;
     skb_head->data_len = skb->len;
     skb_head->protocol = skb->protocol;