From patchwork Sat Mar 29 11:26:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Romieu X-Patchwork-Id: 334954 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 68E95140086 for ; Sat, 29 Mar 2014 22:27:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751774AbaC2L04 (ORCPT ); Sat, 29 Mar 2014 07:26:56 -0400 Received: from violet.fr.zoreil.com ([92.243.8.30]:60879 "EHLO violet.fr.zoreil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751624AbaC2L0x (ORCPT ); Sat, 29 Mar 2014 07:26:53 -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 s2TBQhBg031145; Sat, 29 Mar 2014 12:26:46 +0100 From: Francois Romieu To: David Miller Cc: netdev@vger.kernel.org, Rasesh Mody Subject: [PATCH net-next 15/17] bna: remove open-coded skb_cow_head. Date: Sat, 29 Mar 2014 12:26:28 +0100 Message-Id: <5f87e4774eda1f10fb4f3d4483d4a2e329a2da7b.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: Rasesh Mody --- drivers/net/ethernet/brocade/bna/bnad.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c index a881e98..675550f 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c @@ -2496,12 +2496,10 @@ bnad_tso_prepare(struct bnad *bnad, struct sk_buff *skb) { int err; - if (skb_header_cloned(skb)) { - err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC); - if (err) { - BNAD_UPDATE_CTR(bnad, tso_err); - return err; - } + err = skb_cow_head(skb, 0); + if (err < 0) { + BNAD_UPDATE_CTR(bnad, tso_err); + return err; } /*