From patchwork Sat Mar 29 11:26:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Romieu X-Patchwork-Id: 334956 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 B3C48140086 for ; Sat, 29 Mar 2014 22:27:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751826AbaC2L1T (ORCPT ); Sat, 29 Mar 2014 07:27:19 -0400 Received: from violet.fr.zoreil.com ([92.243.8.30]:60876 "EHLO violet.fr.zoreil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751643AbaC2L0w (ORCPT ); Sat, 29 Mar 2014 07:26:52 -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 s2TBQhBf031145; Sat, 29 Mar 2014 12:26:46 +0100 From: Francois Romieu To: David Miller Cc: netdev@vger.kernel.org, Jitendra Kalsaria , Shahed Shaikh , Ron Mercer Subject: [PATCH net-next 14/17] qlge: remove open-coded skb_cow_head. Date: Sat, 29 Mar 2014 12:26:27 +0100 Message-Id: <925e6f02583e265bad78e85cad80766981001ff1.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: Jitendra Kalsaria Cc: Shahed Shaikh Cc: Ron Mercer --- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c index adf87d2..5b63405 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c @@ -2556,11 +2556,10 @@ static int ql_tso(struct sk_buff *skb, struct ob_mac_tso_iocb_req *mac_iocb_ptr) if (skb_is_gso(skb)) { int err; - if (skb_header_cloned(skb)) { - err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC); - if (err) - return err; - } + + err = skb_cow_head(skb, 0); + if (err < 0) + return err; mac_iocb_ptr->opcode = OPCODE_OB_MAC_TSO_IOCB; mac_iocb_ptr->flags3 |= OB_MAC_TSO_IOCB_IC;