From patchwork Tue Apr 24 13:17:18 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: 903459 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="YsY7Kkj6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkp06wGqz9rx7 for ; Tue, 24 Apr 2018 23:34:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933884AbeDXNRa (ORCPT ); Tue, 24 Apr 2018 09:17:30 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:39987 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933700AbeDXNRY (ORCPT ); Tue, 24 Apr 2018 09:17:24 -0400 Received: by mail-wm0-f65.google.com with SMTP id j5so806453wme.5; Tue, 24 Apr 2018 06:17:23 -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=0Lr0309L85ZsbvAogBu3HFpCTea+nostVkBPb4TLHH0=; b=YsY7Kkj6tlrUJ+/JFWmzGFp/yCl3arpAotf+M34SYFIc6Rf8QKI27vAB7RbKZ+uNq2 19gjhGQVHrMmldiKR+qVZ2iyw+M0j50bv+C9yG0irbc7R5ES9LFtKZQylPmOaAkGQ7XE Uj/YnwAiFRP66GZmxWpSEC+Pv1ks0ETAHSPmfnpj7Keu2wqjGMd8XXWMbGVsWYbKSouf 4dg3p1GkhXSiv8GE6sFSiab/NktQW/YCdb0kBu/68N7JlpDQqf2QTOv6QY69c3uV940e qoYbxRHX5JSnZv6NwZLV4SaNHYccyvowRPBrcLON7EnRRV909VcizVzovmit9Z3k6g+0 05cg== 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=0Lr0309L85ZsbvAogBu3HFpCTea+nostVkBPb4TLHH0=; b=ZvnI4Q2bDxdjPie5qsbB6lpGu5Vuv3cIsxuC8TopEGmPrxkgkKBt3k6qHjeqHyc7Zo F6nTJf4QHcEYwpAbNZMddIKk50y5m+ex9Fiaqh7PrDxUtuFi+ycZMu1/Pzs8PqObTwrM /vnWaTE/A003ibI04JZnRycMMjIF5t0h1hgOozgdyLTjBkuudcv3iSq+I/KH2PF2+bqy J+VT2NtLH9DYCOLXvtD6E0lfKM2v82FE2dmPYdMK5TJPnZOyEsCJsjz67sN42JlHR6d6 YBvZfoPkqPH1prusQS7bFkfeBGBoazLYWs1BDjCN8OKUsjJVgpbWWsOxeGuinJZgVbaG qiYA== X-Gm-Message-State: ALQs6tAvXCe10gCNpWl0w7kJn+fcEjpesNBGVHPk56aIsULIr6KhcuTW S0UJzgqW2zkpJXB5Ku+l5TZ6pOdx3Tg= X-Google-Smtp-Source: AIpwx4+7hWtcs7LHFz+XhvL90ARrN93Hk7qqcI9QSettbuYK8Ae9LRSkmKfW92oW47JjRn5VOJFfQA== X-Received: by 10.80.252.12 with SMTP id i12mr16472871edr.74.1524575842241; Tue, 24 Apr 2018 06:17:22 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id t11sm8910947edh.46.2018.04.24.06.17.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:17:21 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Sergei Shtylyov , "David S. Miller" , Geert Uytterhoeven , Thomas Petazzoni , Laurent Pinchart , Simon Horman , =?utf-8?q?Niklas_S=C3=B6derlund?= , netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH] net: sh-eth: fix sh_eth_start_xmit()'s return type Date: Tue, 24 Apr 2018 15:17:18 +0200 Message-Id: <20180424131720.4357-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 Reviewed-by: Geert Uytterhoeven Acked-by: Sergei Shtylyov --- drivers/net/ethernet/renesas/sh_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index b6b90a631..0875a169f 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -2454,7 +2454,7 @@ static void sh_eth_tx_timeout(struct net_device *ndev) } /* Packet transmit function */ -static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) { struct sh_eth_private *mdp = netdev_priv(ndev); struct sh_eth_txdesc *txdesc;