From patchwork Tue Apr 24 13:16:25 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: 903486 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="SczBW6F7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vl2207fGz9s02 for ; Tue, 24 Apr 2018 23:44:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933759AbeDXNo4 (ORCPT ); Tue, 24 Apr 2018 09:44:56 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34691 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933613AbeDXNQb (ORCPT ); Tue, 24 Apr 2018 09:16:31 -0400 Received: by mail-wm0-f67.google.com with SMTP id w2so509458wmw.1; Tue, 24 Apr 2018 06:16:30 -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=08AAGlRnv2k2kRy6Fg9oKlibpXoDQEExSJgjoqSw/H8=; b=SczBW6F77I8O4wbbX7Qe7hdcX7p8S5CQvi9FJ3B37FOBrczjyBqRqhay743gQsYgLL TafP5hMcqbSfyZZldoxfI+a3fAl1GEsQaPsEuHbxNOPOLcWE0PrIxlmPIpIU/FawFpnx fwPN3/aSVt/YhB0jbUG6/BuaK6up1lbiuc7QMHWDQFiNh31QMUrzLZXX4TkR2ERlINPt OSNc65C3w9pnQH5/0DIp3ZPz9sxI9JCIfYS/lgo4r+JiLYF61HMvQeKECAQvJeLHyaq3 nt7qyyFeP7/cO3risSyla7pn20M8CClyXnrT01YYUufzDKdlBWB4TfPQxreHawC5L7YM vBig== 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=08AAGlRnv2k2kRy6Fg9oKlibpXoDQEExSJgjoqSw/H8=; b=EI46tNP6itulQzxgc/xQWO4lSpuvrSdh9RFRauU4YpkbMYDxA7Atz1qFuyNoFe3SgX i5dwFRIYn2Srp1kMcmcj37lZMywGsjSMNh4lLKUocUxFH2uU6MUpGu4SbQFYwqfvGsZj fwU+f0wD1NAH2K33Fp3zT4oqmoct0YOZM+XZ5pckTGhr1VbGH4VTzJiKWWk9967AXIhu yihgZq5XkeyGjGPrbVxH0GgVNl1xB+XtO7zmo4BFXox4V1RMa9XKDCvqJ6iUXWDVCpYn ARIv9ku1rrFkOQc+H13vfqtV/Xi0y6uwuwWq5NniWEX+N5MIbkG6XnoYm2w9Ep5z5aBZ A34A== X-Gm-Message-State: ALQs6tDMlifpgwsn4Ib4Qb3IjWMN+PXDbKOv0GNpSaWU1WxZm4BYpkuV pAg6ZCt9dm0yQ6Y6zft3isA3XDnIFYc= X-Google-Smtp-Source: AIpwx49tbtZDflTwFjsY3hddUVEGU678CFSv5GFvWudXQNFxYG5H3BtYrIkQmuXYapdAlHVyjQIUtA== X-Received: by 10.80.217.130 with SMTP id w2mr32349899edj.95.1524575789563; Tue, 24 Apr 2018 06:16:29 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id n3sm8962861edl.27.2018.04.24.06.16.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:29 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , "David S. Miller" , Alexander Kochetkov , Romain Perier , netdev@vger.kernel.org Subject: [PATCH] net: arc_emac: fix arc_emac_tx()'s return type Date: Tue, 24 Apr 2018 15:16:25 +0200 Message-Id: <20180424131628.3556-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/arc/emac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c index bd277b0dc..87f395eea 100644 --- a/drivers/net/ethernet/arc/emac_main.c +++ b/drivers/net/ethernet/arc/emac_main.c @@ -676,7 +676,7 @@ static struct net_device_stats *arc_emac_stats(struct net_device *ndev) * * This function is invoked from upper layers to initiate transmission. */ -static int arc_emac_tx(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t arc_emac_tx(struct sk_buff *skb, struct net_device *ndev) { struct arc_emac_priv *priv = netdev_priv(ndev); unsigned int len, *txbd_curr = &priv->txbd_curr;