Merge "net: qualcomm: rmnet: Add headroom for all skbs queued to stack" (5f20ef71) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/net/ethernet/qualcomm/rmnet/rmnet_descriptor.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -434,10 +434,12 @@ static struct sk_buff rmnet_alloc_skb(struct rmnet_frag_descriptor frag_desc,
		if (frag_desc->hdrs_valid) {
		u16 hdr_len = frag_desc->ip_len + frag_desc->trans_len;

		head_skb = alloc_skb(hdr_len, GFP_ATOMIC);
		head_skb = alloc_skb(hdr_len + RMNET_MAP_DEAGGR_HEADROOM,
		GFP_ATOMIC);
		if (!head_skb)
		return NULL;

		skb_reserve(head_skb, RMNET_MAP_DEAGGR_HEADROOM);
		skb_put_data(head_skb, frag_desc->hdr_ptr, hdr_len);
		skb_reset_network_header(head_skb);
		if (frag_desc->trans_len)
		@@ -456,9 +458,12 @@ static struct sk_buff rmnet_alloc_skb(struct rmnet_frag_descriptor frag_desc,
		/* Allocate enough space to avoid penalties in the stack
		* from __pskb_pull_tail()
		*/
		head_skb = alloc_skb(256, GFP_ATOMIC);
		head_skb = alloc_skb(256 + RMNET_MAP_DEAGGR_HEADROOM,
		GFP_ATOMIC);
		if (!head_skb)
		return NULL;

		skb_reserve(head_skb, RMNET_MAP_DEAGGR_HEADROOM);
		}

		/* Add main fragment */