From patchwork Wed Jan 4 00:34:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 710788 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 3ttX2N24r4z9vJ3 for ; Wed, 4 Jan 2017 11:37:16 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JIiRKvFv"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762211AbdADAhJ (ORCPT ); Tue, 3 Jan 2017 19:37:09 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:34403 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762206AbdADAfk (ORCPT ); Tue, 3 Jan 2017 19:35:40 -0500 Received: by mail-pg0-f65.google.com with SMTP id b1so35073395pgc.1 for ; Tue, 03 Jan 2017 16:35:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mbfWFIM80wBqciydfqC624KM4pPP1iOEJvSUkouuPjU=; b=JIiRKvFvJZkdcegEq8oHJcwP6YIvm82bek9229oAr6RWL+Ho/i8okLwyFYIsPhv/TK EUpAOiIjp0wtdJVeghxOzlUIa++srIKZvOmoX8V2NUn1u8UmmIhD1VzlKiJb6qQYak/J xXqQ7+nSfH7pA9gHULMiomqKkdZf6p31nxs3iMJVMhJKrqKLZpSiB1AdiT5kquaeLhaC rEhYY5Br7v0NPJ3BwGmp+qA2dPvWFWcyuVI3W4V2pKpgsg38ZXDA/MVj3Ye57KCaimw1 Z6xuvz5Iy0NxVUm4GUf785YhIwOZUmOgT0bPl8V3Ao75E9w54Av870gHsc2i3/Xmt992 MdeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mbfWFIM80wBqciydfqC624KM4pPP1iOEJvSUkouuPjU=; b=POGaYBj0LX0R2Nbhq84J3rlg78nanuUR2b8MBxIIbQC8jpekiDodmxNEk7AqsIvb6M GFnFznGAPSg6/ybIlEgMTRwqzAdwDqtFpjP+o6BfjBOnPrpgJQ4uB/0BJ/qoBYpu6NcQ +8JJ6d65+zyATWWEeEwdcsGtG+ZLFIkghuUIMUZKAYx9YGGjt/DxdSWhpNPSZV52IPgM naBwO8DKgZa4Lf7THs+ZKI0FGPytiSRMB+lMMR74NqUmlcghonJ/bwbc7xJFCNHBrSVq xZ7k1SWqmv9FIXRdBz/dbrLJEZg1WIXeqNg5qL9+LruSFzMyfE54c3ea7FlrMxSgh3cH Eh6Q== X-Gm-Message-State: AIkVDXLTZm51z27fgsD5B7O3aNhgAcMQyeZL9EedNRyKTy8hLY2R7q4Ctub8qpIlAXOL2A== X-Received: by 10.99.36.65 with SMTP id k62mr119025715pgk.13.1483490100611; Tue, 03 Jan 2017 16:35:00 -0800 (PST) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id y15sm143787593pgc.43.2017.01.03.16.34.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jan 2017 16:35:00 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, Florian Fainelli Subject: [PATCH net 1/2] net: systemport: Utilize skb_put_padto() Date: Tue, 3 Jan 2017 16:34:48 -0800 Message-Id: <20170104003449.27078-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170104003449.27078-1-f.fainelli@gmail.com> References: <20170104003449.27078-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since we need to pad our packets, utilize skb_put_padto() which increases skb->len by how much we need to pad, allowing us to eliminate the test on skb->len right below. Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/bcmsysport.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index 25d1eb4933d0..e67908b5edfe 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -1028,13 +1028,12 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb, * (including FCS and tag) because the length verification is done after * the Broadcom tag is stripped off the ingress packet. */ - if (skb_padto(skb, ETH_ZLEN + ENET_BRCM_TAG_LEN)) { + if (skb_put_padto(skb, ETH_ZLEN + ENET_BRCM_TAG_LEN)) { ret = NETDEV_TX_OK; goto out; } - skb_len = skb->len < ETH_ZLEN + ENET_BRCM_TAG_LEN ? - ETH_ZLEN + ENET_BRCM_TAG_LEN : skb->len; + skb_len = skb->len; mapping = dma_map_single(kdev, skb->data, skb_len, DMA_TO_DEVICE); if (dma_mapping_error(kdev, mapping)) {