Commit ab34e142 authored by Michal Luczaj's avatar Michal Luczaj Committed by Jakub Kicinski
Browse files

net: skbuff: Drop unused @skb 



Since its introduction in commit 6fa01ccd ("skbuff: Add pskb_extract()
helper function"), pskb_carve_frag_list() never used the argument @skb.
Drop it and adapt the only caller.

No functional change intended.

Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarMichal Luczaj <mhal@rbox.co>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ad0ac6cd

net/core/skbuff.c

+2 −3
Original line number Diff line number Diff line
@@ -6758,8 +6758,7 @@ static int pskb_carve(struct sk_buff *skb, const u32 off, gfp_t gfp); 
/* carve out the first eat bytes from skb's frag_list. May recurse into

 * pskb_carve()

 */

static int pskb_carve_frag_list(struct sk_buff *skb,

				struct skb_shared_info *shinfo, int eat,

static int pskb_carve_frag_list(struct skb_shared_info *shinfo, int eat,

				gfp_t gfp_mask)

{

	struct sk_buff *list = shinfo->frag_list;
@@ -6864,7 +6863,7 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off, 
		skb_clone_fraglist(skb);



	/* split line is in frag list */

	if (k == 0 && pskb_carve_frag_list(skb, shinfo, off - pos, gfp_mask)) {

	if (k == 0 && pskb_carve_frag_list(shinfo, off - pos, gfp_mask)) {

		/* skb_frag_unref() is not needed here as shinfo->nr_frags = 0. */

		if (skb_has_frag_list(skb))

			kfree_skb_list(skb_shinfo(skb)->frag_list);