From 3e5d687c2bb88d58e0f0e3bcc309167441f53c05 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 5 Dec 2010 18:50:32 +0000
Subject: [PATCH] --- yaml --- r: 223250 b: refs/heads/master c:
 a19faf0250e09b16cac169354126404bc8aa342b h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/net/core/timestamping.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d86557c107e6..69bed02c0042 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c710245caa41060e983cc9cb5ffcc020e02ca45f
+refs/heads/master: a19faf0250e09b16cac169354126404bc8aa342b
diff --git a/trunk/net/core/timestamping.c b/trunk/net/core/timestamping.c
index 0ae6c22da85b..c19bb4ee405e 100644
--- a/trunk/net/core/timestamping.c
+++ b/trunk/net/core/timestamping.c
@@ -96,11 +96,13 @@ bool skb_defer_rx_timestamp(struct sk_buff *skb)
 	struct phy_device *phydev;
 	unsigned int type;
 
-	skb_push(skb, ETH_HLEN);
+	if (skb_headroom(skb) < ETH_HLEN)
+		return false;
+	__skb_push(skb, ETH_HLEN);
 
 	type = classify(skb);
 
-	skb_pull(skb, ETH_HLEN);
+	__skb_pull(skb, ETH_HLEN);
 
 	switch (type) {
 	case PTP_CLASS_V1_IPV4: