Commit be769db2 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

net: Get rid of consume_skb when tracing is off 



The function consume_skb is only meaningful when tracing is enabled.
This patch makes it conditional on CONFIG_TRACEPOINTS.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ee39c14

include/linux/skbuff.h

+9 −0
Original line number Diff line number Diff line
@@ -1056,7 +1056,16 @@ void kfree_skb(struct sk_buff *skb); 
void kfree_skb_list(struct sk_buff *segs);

void skb_dump(const char *level, const struct sk_buff *skb, bool full_pkt);

void skb_tx_error(struct sk_buff *skb);



#ifdef CONFIG_TRACEPOINTS

void consume_skb(struct sk_buff *skb);

#else

static inline void consume_skb(struct sk_buff *skb)

{

	return kfree_skb(skb);

}

#endif



void __consume_stateless_skb(struct sk_buff *skb);

void  __kfree_skb(struct sk_buff *skb);

extern struct kmem_cache *skbuff_head_cache;

net/core/skbuff.c

+2 −0
Original line number Diff line number Diff line
@@ -820,6 +820,7 @@ void skb_tx_error(struct sk_buff *skb) 
}

EXPORT_SYMBOL(skb_tx_error);



#ifdef CONFIG_TRACEPOINTS

/**

 *	consume_skb - free an skbuff

 *	@skb: buffer to free
@@ -837,6 +838,7 @@ void consume_skb(struct sk_buff *skb) 
	__kfree_skb(skb);

}

EXPORT_SYMBOL(consume_skb);

#endif



/**

 *	consume_stateless_skb - free an skbuff, assuming it is stateless