Commit 419ae74e authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller
Browse files

[NET]: uninline skb_trim, de-bloats 



Allyesconfig (v2.6.24-mm1):
-10976  209 funcs, 123 +, 11099 -, diff: -10976 --- skb_trim

Without number of debug related CONFIGs (v2.6.25-rc2-mm1):
-7360  192 funcs, 131 +, 7491 -, diff: -7360 --- skb_trim
skb_trim                      |  +42

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8d330868

include/linux/skbuff.h

+1 −15
Original line number Diff line number Diff line
@@ -1158,21 +1158,7 @@ static inline void __skb_trim(struct sk_buff *skb, unsigned int len) 
	skb_set_tail_pointer(skb, len);

}



/**

 *	skb_trim - remove end from a buffer

 *	@skb: buffer to alter

 *	@len: new length

 *

 *	Cut the length of a buffer down by removing data from the tail. If

 *	the buffer is already under the length specified it is not modified.

 *	The skb must be linear.

 */

static inline void skb_trim(struct sk_buff *skb, unsigned int len)

{

	if (skb->len > len)

		__skb_trim(skb, len);

}



extern void skb_trim(struct sk_buff *skb, unsigned int len);



static inline int __pskb_trim(struct sk_buff *skb, unsigned int len)

{

net/core/skbuff.c

+16 −0
Original line number Diff line number Diff line
@@ -931,6 +931,22 @@ unsigned char *skb_pull(struct sk_buff *skb, unsigned int len) 
}

EXPORT_SYMBOL(skb_pull);



/**

 *	skb_trim - remove end from a buffer

 *	@skb: buffer to alter

 *	@len: new length

 *

 *	Cut the length of a buffer down by removing data from the tail. If

 *	the buffer is already under the length specified it is not modified.

 *	The skb must be linear.

 */

void skb_trim(struct sk_buff *skb, unsigned int len)

{

	if (skb->len > len)

		__skb_trim(skb, len);

}

EXPORT_SYMBOL(skb_trim);



/* Trims skb to length len. It can change skb pointers.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE