Commit 763087da authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

net: add skb_set_end_offset() helper 



We have multiple places where this helper is convenient,
and plan using it in the following patch.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0ebea8f9

include/linux/skbuff.h

+10 −0
Original line number Diff line number Diff line
@@ -1536,6 +1536,11 @@ static inline unsigned int skb_end_offset(const struct sk_buff *skb) 
{

	return skb->end;

}



static inline void skb_set_end_offset(struct sk_buff *skb, unsigned int offset)

{

	skb->end = offset;

}

#else

static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)

{
@@ -1546,6 +1551,11 @@ static inline unsigned int skb_end_offset(const struct sk_buff *skb) 
{

	return skb->end - skb->head;

}



static inline void skb_set_end_offset(struct sk_buff *skb, unsigned int offset)

{

	skb->end = skb->head + offset;

}

#endif



/* Internal */

net/core/skbuff.c

+5 −14
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static void __build_skb_around(struct sk_buff *skb, void *data, 
	skb->head = data;

	skb->data = data;

	skb_reset_tail_pointer(skb);

	skb->end = skb->tail + size;

	skb_set_end_offset(skb, size);

	skb->mac_header = (typeof(skb->mac_header))~0U;

	skb->transport_header = (typeof(skb->transport_header))~0U;
@@ -1736,11 +1736,10 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail, 
	skb->head     = data;

	skb->head_frag = 0;

	skb->data    += off;



	skb_set_end_offset(skb, size);

#ifdef NET_SKBUFF_DATA_USES_OFFSET

	skb->end      = size;

	off           = nhead;

#else

	skb->end      = skb->head + size;

#endif

	skb->tail	      += off;

	skb_headers_offset_update(skb, nhead);
@@ -6044,11 +6043,7 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off, 
	skb->head = data;

	skb->data = data;

	skb->head_frag = 0;

#ifdef NET_SKBUFF_DATA_USES_OFFSET

	skb->end = size;

#else

	skb->end = skb->head + size;

#endif

	skb_set_end_offset(skb, size);

	skb_set_tail_pointer(skb, skb_headlen(skb));

	skb_headers_offset_update(skb, 0);

	skb->cloned = 0;
@@ -6186,11 +6181,7 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off, 
	skb->head = data;

	skb->head_frag = 0;

	skb->data = data;

#ifdef NET_SKBUFF_DATA_USES_OFFSET

	skb->end = size;

#else

	skb->end = skb->head + size;

#endif

	skb_set_end_offset(skb, size);

	skb_reset_tail_pointer(skb);

	skb_headers_offset_update(skb, 0);

	skb->cloned   = 0;