From aabfcf8379b1fea2d671589660021a0e59238535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Thu, 27 Mar 2008 17:47:24 -0700
Subject: [PATCH] --- yaml --- r: 90417 b: refs/heads/master c:
 6be8ac2fdc5e69dec53913a42312a92dbfbd4907 h: refs/heads/master i:   90415:
 cecec6b6b57ff6b4b847108bb67d288f7340eef5 v: v3

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

diff --git a/[refs] b/[refs]
index 3d11f6e42ea7..a2c028996cbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dde3e16485dca16eb682dd59da1a598bf62e284
+refs/heads/master: 6be8ac2fdc5e69dec53913a42312a92dbfbd4907
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index f085955cb5a7..6d6cde7b243c 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -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)
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index 3402eca768f8..cf489b6329e8 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -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.
  */