From patchwork Tue Apr 24 13:16:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 903478 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sE1WjMMK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkz80LMLz9rx7 for ; Tue, 24 Apr 2018 23:42:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933775AbeDXNQ7 (ORCPT ); Tue, 24 Apr 2018 09:16:59 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:52068 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933734AbeDXNQr (ORCPT ); Tue, 24 Apr 2018 09:16:47 -0400 Received: by mail-wm0-f68.google.com with SMTP id j4so906614wme.1; Tue, 24 Apr 2018 06:16:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=UIaa2HqXf5epjczrhXKNg+pKjgFOnuK7e1ViPiUyxqI=; b=sE1WjMMKg22bXyiOedMm1e6XWA9N9x51aqvs+H0C12QG5OVfujdaM7R7kOm1oA6le7 k15yO1r0pTQ8FFIg3D2gzW1dEA+CTZ0SvTRtlVv0/zMUiyKFFisbSqxZTyTNbODnDhAd fZN2rbEaALIeSBe7MssRbIHlW5M0OsCQNNLCRvuqYIh0OS9oTQ8rf9JHDpic3KjHD6bP ZXTlNxbbrTnCiBYdzoVM5K2zZ3+ACXPHQVYJlM1Ou0ntc7LB5gu9UGfsvIib1VEIiGD1 1rKY0Ob7aS+Da6orRkiFyfQhir4kaxZP+YqJC3teSlf01Ozn/UfdFs8dvnLeqlcEkmmI psfw== 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; bh=UIaa2HqXf5epjczrhXKNg+pKjgFOnuK7e1ViPiUyxqI=; b=S2EIDR69DbrLolT8U+Iwb3+QAn/+R6I21d2psM9XbQ1TEK6S+1GOiGSTblQMq3y8LS iVgttwCPzR06JRnoWSGEDR0C63O9BRm3NB/QXo2TA3DH4iCQOpVzRR8n6LSfuO3MwbuY AQlZ5MMFcq59YJNerD1sYB+RQJ0NC6mdq4Ic359tIKZMXjyQOUsCPYwffirZnrx9LXZD PobrwAeBKjwqdSmskR8E1i68XPr+NnYPk9V0XTPc66xQrX1JVDGPpnu9AqqD196c3/jY cHMRbo7WLJPJZ78iaRjKfzpWvxQdtwQCZ2jUdLD8jLqDzUo2EoXgXszCb2tPwKTS15hI aKGw== X-Gm-Message-State: ALQs6tACZ7QcKx2t8k2uQ7KL7sCTB/2oqjy0wXtGotA0wDIQBlDsIV/U DrolwmFNXR0iNSL6eA2i7hnYRYh0sNU= X-Google-Smtp-Source: AIpwx48l9hhtLqgio32xZjWgaaTYui8awSiZVseV9meABsJ3hwcit4Aja1LyfxO9YjREp6SvMt3CeQ== X-Received: by 10.80.138.34 with SMTP id i31mr33300424edi.294.1524575805851; Tue, 24 Apr 2018 06:16:45 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id v40sm8611481edm.35.2018.04.24.06.16.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:45 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Claudiu Manoil , netdev@vger.kernel.org Subject: [PATCH] net: gianfar: fix gfar_start_xmit()'s return type Date: Tue, 24 Apr 2018 15:16:44 +0200 Message-Id: <20180424131644.3856-1-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.17.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, but the implementation in this driver returns an 'int'. Fix this by returning 'netdev_tx_t' in this driver too. Signed-off-by: Luc Van Oostenryck --- drivers/net/ethernet/freescale/gianfar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index f27f9bae1..c97c4edfa 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -112,7 +112,7 @@ const char gfar_driver_version[] = "2.0"; static int gfar_enet_open(struct net_device *dev); -static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev); +static netdev_tx_t gfar_start_xmit(struct sk_buff *skb, struct net_device *dev); static void gfar_reset_task(struct work_struct *work); static void gfar_timeout(struct net_device *dev); static int gfar_close(struct net_device *dev); @@ -2334,7 +2334,7 @@ static inline bool gfar_csum_errata_76(struct gfar_private *priv, /* This is called by the kernel when a frame is ready for transmission. * It is pointed to by the dev->hard_start_xmit function pointer */ -static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct gfar_private *priv = netdev_priv(dev); struct gfar_priv_tx_q *tx_queue = NULL;