From patchwork Sat Sep 21 06:17:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 1165540 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=wanadoo.fr Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46b0kq2yj9z9sNw for ; Sat, 21 Sep 2019 16:18:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407068AbfIUGRt (ORCPT ); Sat, 21 Sep 2019 02:17:49 -0400 Received: from smtp08.smtpout.orange.fr ([80.12.242.130]:50282 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731000AbfIUGRt (ORCPT ); Sat, 21 Sep 2019 02:17:49 -0400 Received: from localhost.localdomain ([93.22.38.188]) by mwinf5d68 with ME id 46Hj2100d43Zwrh036HkQu; Sat, 21 Sep 2019 08:17:45 +0200 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 21 Sep 2019 08:17:45 +0200 X-ME-IP: 93.22.38.188 From: Christophe JAILLET To: khc@pm.waw.pl, davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH] hdlc: Simplify code in 'pvc_xmit()' Date: Sat, 21 Sep 2019 08:17:38 +0200 Message-Id: <20190921061738.25326-1-christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use __skb_pad instead of rewriting it, this saves some LoC. Signed-off-by: Christophe JAILLET --- Compile tested only. --- drivers/net/wan/hdlc_fr.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index 9acad651ea1f..30f20b667c8b 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c @@ -414,16 +414,12 @@ static netdev_tx_t pvc_xmit(struct sk_buff *skb, struct net_device *dev) if (dev->type == ARPHRD_ETHER) { int pad = ETH_ZLEN - skb->len; if (pad > 0) { /* Pad the frame with zeros */ - int len = skb->len; - if (skb_tailroom(skb) < pad) - if (pskb_expand_head(skb, 0, pad, - GFP_ATOMIC)) { - dev->stats.tx_dropped++; - dev_kfree_skb(skb); - return NETDEV_TX_OK; - } + if (__skb_pad(skb, pad, false) < 0) { + dev->stats.tx_dropped++; + dev_kfree_skb(skb); + return NETDEV_TX_OK; + } skb_put(skb, pad); - memset(skb->data + len, 0, pad); } skb->protocol = cpu_to_be16(ETH_P_802_3); }