From patchwork Tue Apr 24 13:17:35 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: 903456 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="i+anh9SD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vklq3Stqz9s02 for ; Tue, 24 Apr 2018 23:32:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934391AbeDXNcf (ORCPT ); Tue, 24 Apr 2018 09:32:35 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33464 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933700AbeDXNRl (ORCPT ); Tue, 24 Apr 2018 09:17:41 -0400 Received: by mail-wm0-f67.google.com with SMTP id x12so511495wmc.0; Tue, 24 Apr 2018 06:17:40 -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=v1KAsN0OFdFiozRgWTPIdOsrAFT5RtlFYdzqIPbD/LQ=; b=i+anh9SDsbb0R4bZe12cpCzY0B4QtmoM7NOzn6VI2oeHBgQ/COQf3UlHYUlz/ctzVl lBybd9f7daJtllgY7N3fGgZ5bNfz1fV9X7iLM9ERhLGUyivm7SSuS74B1lC0U58LudpQ AGgv9BpexAZIbKz0OxpJOSmYE7DFhb1JIv6gGbie9k/zD+yT74fBp7+gZHuyZUE3EWfd 36cFJF8rMaPs+3Lno0pxzuFr3pmswKcVeG1i6+RZIjKF2Hfiov/ggiPw0YBXn5b4Qgmv QmQwSgL9RH+lnsmtwpfirZ0TC9VlPlFmr9JF2tgXT+qW9VepOyoGpVV0zrsnC5nzQ/Vq gA+Q== 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=v1KAsN0OFdFiozRgWTPIdOsrAFT5RtlFYdzqIPbD/LQ=; b=gJItsZg2wCP3Z05QQ9ZZcNugzfEJ/95yoOhsoRfnC4Nz26obeEK2G17eAas8ER2Bgc hzNnrJTPUCBHIhszMpczSO3BCU+OHgJySB1wxIsAVnrKfsx4QZbGDREqVtrw8dYhbRwU uEHL7KH+Ecm+C9aXbIg0h3iIBg/kRmZsvGygIYkOfohaWzqVCyhuki7NHx7Z2+osxTIg TpRhduE8beHi6synrYBk14SH6hSghsL2Fx72eEAwPVY/PtJ/eseOHSKbh45UHfwdxHH4 J0jAj2kteC2FLbUvBrBtpL36aU6ioSKTVu1pr+Agv79Fjmnvd5+A3/31w5vPuB2nU+45 QsEw== X-Gm-Message-State: ALQs6tBmrbTHdZQM3Bi7Z9l6vurtec2SRVbq9CSB1GHAnHcAXBTd+qlc OHZZyuBGwg1QXiGuC98RVs2+uxwgtJY= X-Google-Smtp-Source: AB8JxZpXlX5yUPQK2zvR4iTzjwHcwq5QqiK3x13C2erazr3PIiHiF4it756k69zRHyGzxk/AMe+HwQ== X-Received: by 10.80.163.101 with SMTP id 92mr384723edn.46.1524575859856; Tue, 24 Apr 2018 06:17:39 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id g7sm6161354edf.90.2018.04.24.06.17.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:17:39 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , netdev@vger.kernel.org Subject: [PATCH] net: w5100: fix w5100_start_tx()'s return type Date: Tue, 24 Apr 2018 15:17:35 +0200 Message-Id: <20180424131738.4559-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/wiznet/w5100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index 2bdfb3921..d8ba512f1 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c @@ -835,7 +835,7 @@ static void w5100_tx_work(struct work_struct *work) w5100_tx_skb(priv->ndev, skb); } -static int w5100_start_tx(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t w5100_start_tx(struct sk_buff *skb, struct net_device *ndev) { struct w5100_priv *priv = netdev_priv(ndev);