lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

skb: make skb_recycle_check() return a bool value

Browse Source 
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Changli Gao
2010-05-29 00:12:13 -07:00
committed by David S. Miller
parent 6057fd78a8
commit 5b0daa3474
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/skbuff.h
View File

@@ -501,7 +501,7 @@ static inline struct sk_buff *alloc_skb_fclone(unsigned int size,
return __alloc_skb(size, priority, 1, -1); return __alloc_skb(size, priority, 1, -1);
} }
extern int skb_recycle_check(struct sk_buff *skb, int skb_size); extern bool skb_recycle_check(struct sk_buff *skb, int skb_size);
extern struct sk_buff *skb_morph(struct sk_buff *dst, struct sk_buff *src); extern struct sk_buff *skb_morph(struct sk_buff *dst, struct sk_buff *src);
extern struct sk_buff *skb_clone(struct sk_buff *skb, extern struct sk_buff *skb_clone(struct sk_buff *skb,

12
net/core/skbuff.c
View File

@@ -482,22 +482,22 @@ EXPORT_SYMBOL(consume_skb);
* reference count dropping and cleans up the skbuff as if it * reference count dropping and cleans up the skbuff as if it
* just came from __alloc_skb(). * just came from __alloc_skb().
*/ */
int skb_recycle_check(struct sk_buff *skb, int skb_size) bool skb_recycle_check(struct sk_buff *skb, int skb_size)
{ {
struct skb_shared_info *shinfo; struct skb_shared_info *shinfo;
if (irqs_disabled()) if (irqs_disabled())
return 0; return false;
if (skb_is_nonlinear(skb) || skb->fclone != SKB_FCLONE_UNAVAILABLE) if (skb_is_nonlinear(skb) || skb->fclone != SKB_FCLONE_UNAVAILABLE)
return 0; return false;
skb_size = SKB_DATA_ALIGN(skb_size + NET_SKB_PAD); skb_size = SKB_DATA_ALIGN(skb_size + NET_SKB_PAD);
if (skb_end_pointer(skb) - skb->head < skb_size) if (skb_end_pointer(skb) - skb->head < skb_size)
return 0; return false;
if (skb_shared(skb) || skb_cloned(skb)) if (skb_shared(skb) || skb_cloned(skb))
return 0; return false;
skb_release_head_state(skb); skb_release_head_state(skb);
@@ -509,7 +509,7 @@ int skb_recycle_check(struct sk_buff *skb, int skb_size)
skb->data = skb->head + NET_SKB_PAD; skb->data = skb->head + NET_SKB_PAD;
skb_reset_tail_pointer(skb); skb_reset_tail_pointer(skb);
return 1; return true;
} }
EXPORT_SYMBOL(skb_recycle_check); EXPORT_SYMBOL(skb_recycle_check);