forked from mirrors/linux
		
	[NET]: uninline skb_pull, de-bloats a lot
Allyesconfig (v2.6.24-mm1): -28162 354 funcs, 3005 +, 31167 -, diff: -28162 --- skb_pull Without number of debug related CONFIGs (v2.6.25-rc2-mm1): -9697 338 funcs, 221 +, 9918 -, diff: -9697 --- skb_pull skb_pull | +44 Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
		
							parent
							
								
									0dde3e1648
								
							
						
					
					
						commit
						6be8ac2fdc
					
				
					 2 changed files with 17 additions and 15 deletions
				
			
		| 
						 | 
				
			
			@ -927,6 +927,7 @@ static inline unsigned char *skb_push(struct sk_buff *skb, unsigned int len)
 | 
			
		|||
	return skb->data;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
extern unsigned char *skb_pull(struct sk_buff *skb, unsigned int len);
 | 
			
		||||
static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len)
 | 
			
		||||
{
 | 
			
		||||
	skb->len -= len;
 | 
			
		||||
| 
						 | 
				
			
			@ -934,21 +935,6 @@ static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len)
 | 
			
		|||
	return skb->data += len;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 *	skb_pull - remove data from the start of a buffer
 | 
			
		||||
 *	@skb: buffer to use
 | 
			
		||||
 *	@len: amount of data to remove
 | 
			
		||||
 *
 | 
			
		||||
 *	This function removes data from the start of a buffer, returning
 | 
			
		||||
 *	the memory to the headroom. A pointer to the next data in the buffer
 | 
			
		||||
 *	is returned. Once the data has been pulled future pushes will overwrite
 | 
			
		||||
 *	the old data.
 | 
			
		||||
 */
 | 
			
		||||
static inline unsigned char *skb_pull(struct sk_buff *skb, unsigned int len)
 | 
			
		||||
{
 | 
			
		||||
	return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
extern unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta);
 | 
			
		||||
 | 
			
		||||
static inline unsigned char *__pskb_pull(struct sk_buff *skb, unsigned int len)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -878,6 +878,22 @@ unsigned char *skb_put(struct sk_buff *skb, unsigned int len)
 | 
			
		|||
}
 | 
			
		||||
EXPORT_SYMBOL(skb_put);
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 *	skb_pull - remove data from the start of a buffer
 | 
			
		||||
 *	@skb: buffer to use
 | 
			
		||||
 *	@len: amount of data to remove
 | 
			
		||||
 *
 | 
			
		||||
 *	This function removes data from the start of a buffer, returning
 | 
			
		||||
 *	the memory to the headroom. A pointer to the next data in the buffer
 | 
			
		||||
 *	is returned. Once the data has been pulled future pushes will overwrite
 | 
			
		||||
 *	the old data.
 | 
			
		||||
 */
 | 
			
		||||
unsigned char *skb_pull(struct sk_buff *skb, unsigned int len)
 | 
			
		||||
{
 | 
			
		||||
	return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len);
 | 
			
		||||
}
 | 
			
		||||
EXPORT_SYMBOL(skb_pull);
 | 
			
		||||
 | 
			
		||||
/* Trims skb to length len. It can change skb pointers.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue