From e0ff1136581fe7fd5db788e8298367171cf331ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=F6rn=20Engel?= <joern@wohnheim.fh-wedel.de>
Date: Mon, 20 Mar 2006 21:28:35 -0800
Subject: [PATCH] --- yaml --- r: 22219 b: refs/heads/master c:
 231d06ae826664b83369166449144304859a62fa h: refs/heads/master i:   22217:
 e92a1b213c7a3e01c398d745ec720336fc11dba3   22215:
 651192c379d9484cc4b256c20fd9776b6fff0a53 v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/skbuff.h | 17 +----------------
 trunk/net/core/skbuff.c      | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index a94704a7f8b8..9c8348c2af1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e1f47c74c26a591fc490eb339f1b3167361158b
+refs/heads/master: 231d06ae826664b83369166449144304859a62fa
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 1a2611030d36..75c963103b9f 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -304,6 +304,7 @@ struct sk_buff {
 
 #include <asm/system.h>
 
+extern void kfree_skb(struct sk_buff *skb);
 extern void	       __kfree_skb(struct sk_buff *skb);
 extern struct sk_buff *__alloc_skb(unsigned int size,
 				   gfp_t priority, int fclone);
@@ -403,22 +404,6 @@ static inline struct sk_buff *skb_get(struct sk_buff *skb)
  * atomic change.
  */
 
-/**
- *	kfree_skb - free an sk_buff
- *	@skb: buffer to free
- *
- *	Drop a reference to the buffer and free it if the usage count has
- *	hit zero.
- */
-static inline void kfree_skb(struct sk_buff *skb)
-{
-	if (likely(atomic_read(&skb->users) == 1))
-		smp_rmb();
-	else if (likely(!atomic_dec_and_test(&skb->users)))
-		return;
-	__kfree_skb(skb);
-}
-
 /**
  *	skb_cloned - is the buffer a clone
  *	@skb: buffer to check
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index 2144952d1c6c..01abf1e8990b 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -355,6 +355,24 @@ void __kfree_skb(struct sk_buff *skb)
 	kfree_skbmem(skb);
 }
 
+/**
+ *	kfree_skb - free an sk_buff
+ *	@skb: buffer to free
+ *
+ *	Drop a reference to the buffer and free it if the usage count has
+ *	hit zero.
+ */
+void kfree_skb(struct sk_buff *skb)
+{
+	if (unlikely(!skb))
+		return;
+	if (likely(atomic_read(&skb->users) == 1))
+		smp_rmb();
+	else if (likely(!atomic_dec_and_test(&skb->users)))
+		return;
+	__kfree_skb(skb);
+}
+
 /**
  *	skb_clone	-	duplicate an sk_buff
  *	@skb: buffer to clone
@@ -1799,6 +1817,7 @@ void __init skb_init(void)
 
 EXPORT_SYMBOL(___pskb_trim);
 EXPORT_SYMBOL(__kfree_skb);
+EXPORT_SYMBOL(kfree_skb);
 EXPORT_SYMBOL(__pskb_pull_tail);
 EXPORT_SYMBOL(__alloc_skb);
 EXPORT_SYMBOL(pskb_copy);