From e7b1a70fd88c2b604fed83aa00f95acbfc031162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?fran=C3=A7ois=20romieu?= <romieu@fr.zoreil.com>
Date: Tue, 15 Jul 2014 23:55:35 +0200
Subject: [PATCH] UPSTREAM: net: remove open-coded skb_cow_head.

(cherry-picked from commit a40e0a664bce465a3b8ad1d792153cef8ded9f7d)

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Bug: 63963029
Change-Id: I7dd39f3a6dd980ce66827a3bb545fa08b964ed73
---
 net/core/dev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index 5735e296b205..3d49ebe12f42 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2375,8 +2375,8 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
 		int err;
 
 		/* We're going to init ->check field in TCP or UDP header */
-		if (skb_header_cloned(skb) &&
-		    (err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
+		err = skb_cow_head(skb, 0);
+		if (err < 0)
 			return ERR_PTR(err);
 	}