From patchwork Sat Mar 29 11:26:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Romieu X-Patchwork-Id: 334960 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E6C0C1400A5 for ; Sat, 29 Mar 2014 22:27:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751903AbaC2L1f (ORCPT ); Sat, 29 Mar 2014 07:27:35 -0400 Received: from violet.fr.zoreil.com ([92.243.8.30]:60868 "EHLO violet.fr.zoreil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751649AbaC2L0v (ORCPT ); Sat, 29 Mar 2014 07:26:51 -0400 Received: from violet.fr.zoreil.com (localhost [127.0.0.1]) by violet.fr.zoreil.com (8.14.5/8.14.5) with ESMTP id s2TBQhBa031145; Sat, 29 Mar 2014 12:26:44 +0100 From: Francois Romieu To: David Miller Cc: netdev@vger.kernel.org, Jesse Brandeburg , Jeff Kirsher Subject: [PATCH net-next 09/17] e1000: remove open-coded skb_cow_head. Date: Sat, 29 Mar 2014 12:26:22 +0100 Message-Id: <5317eb48fee5ca58a806268ebb7726924d926834.1396090802.git.romieu@fr.zoreil.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: References: In-Reply-To: References: X-Organisation: Land of Sunshine Inc. Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Francois Romieu Cc: Jesse Brandeburg Cc: Jeff Kirsher --- drivers/net/ethernet/intel/e1000/e1000_main.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index 46e6544..27058df 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c @@ -2682,14 +2682,13 @@ static int e1000_tso(struct e1000_adapter *adapter, u32 cmd_length = 0; u16 ipcse = 0, tucse, mss; u8 ipcss, ipcso, tucss, tucso, hdr_len; - int err; if (skb_is_gso(skb)) { - if (skb_header_cloned(skb)) { - err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC); - if (err) - return err; - } + int err; + + err = skb_cow_head(skb, 0); + if (err < 0) + return err; hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb); mss = skb_shinfo(skb)->gso_size;