From ee40942e21c6a3faba57821635df3d8672b43782 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sun, 2 May 2010 02:21:44 -0700
Subject: [PATCH] --- yaml --- r: 194620 b: refs/heads/master c:
 47d29646a2c1c147d8a7598aeac2c87dd71ed638 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/skbuff.h | 5 +++++
 trunk/net/core/skbuff.c      | 2 +-
 trunk/net/ethernet/eth.c     | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 001caead2296..f3571ed7935a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43815482370c510c569fd18edb57afcb0fa8cab6
+refs/heads/master: 47d29646a2c1c147d8a7598aeac2c87dd71ed638
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 82f5116a89e4..746a652b9f6f 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -1128,6 +1128,11 @@ static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len)
 	return skb->data += len;
 }
 
+static inline unsigned char *skb_pull_inline(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 4218ff49bf13..8b9c109166a7 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -1051,7 +1051,7 @@ EXPORT_SYMBOL(skb_push);
  */
 unsigned char *skb_pull(struct sk_buff *skb, unsigned int len)
 {
-	return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len);
+	return skb_pull_inline(skb, len);
 }
 EXPORT_SYMBOL(skb_pull);
 
diff --git a/trunk/net/ethernet/eth.c b/trunk/net/ethernet/eth.c
index 0c0d272a9888..61ec0329316c 100644
--- a/trunk/net/ethernet/eth.c
+++ b/trunk/net/ethernet/eth.c
@@ -162,7 +162,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
 
 	skb->dev = dev;
 	skb_reset_mac_header(skb);
-	skb_pull(skb, ETH_HLEN);
+	skb_pull_inline(skb, ETH_HLEN);
 	eth = eth_hdr(skb);
 
 	if (unlikely(is_multicast_ether_addr(eth->h_dest))) {