---

yaml --- r: 223250 b: refs/heads/master c: a19faf0 h: refs/heads/master v: v3
git-mirror · Dec 11, 2010 · 3e5d687 · 3e5d687
1 parent 903c4d1
commit 3e5d687
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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: