From patchwork Tue Apr 24 13:16: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: 903497 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="BkfJdKXB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vl6m6QCWz9s02 for ; Tue, 24 Apr 2018 23:49:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758238AbeDXNtB (ORCPT ); Tue, 24 Apr 2018 09:49:01 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:50923 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933668AbeDXNQV (ORCPT ); Tue, 24 Apr 2018 09:16:21 -0400 Received: by mail-wm0-f67.google.com with SMTP id t67so902102wmt.0; Tue, 24 Apr 2018 06:16:21 -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=8sWsN+mh33nv3HXW0rrDyokfnQ2dEDflIsMvQQtXKtw=; b=BkfJdKXBuAr+KrLTvHz1Vqea9OPuyOqeT1/GmzR8kCrloVXYT4A15xoqIhxOgObqU/ pmjFu9Mxo+Ivgsssvc4cu2HXF3UYsw9777/V7wya0X0kI7SKKx5lE7x866fcIVT5tavD 15PQHcV+42qyIYqr6SNXQvyIUHKqQF4m1MzAoetNj03ZlWsfH3vaeaErb2k0A7eN5XMR 1H4oytbOR+x6hq2qDwyGJ1v/Qbn0zTgmMnDf+ZxCJSzsvmhOnq73hbFRegcLYLPxXwQQ w7dM2O/Wq128V5KDyu9a3YsnQeV86Mk2ZH6usW2zaSzDMj6WFi7M9b+kpL9r+Dd+0IDN r2WQ== 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=8sWsN+mh33nv3HXW0rrDyokfnQ2dEDflIsMvQQtXKtw=; b=JVaNMElSQXtdZSF/cmhAf3I9/4BebIfesLY/QpMVodnjombJcF+5Du7bjX/XIP1Okt MWRyi04+9i4PFHh4ae8U3wZSNkG4nhqYxt/DijDiCrmFavMBYtClb3g/TX2NybwTfFiq /E+ALqOtnW6dk85F7My8ozQTKzJwyYFdJwYw7EuzK9Ia7AND/JWp61Ms5YBIvmvNsFXc 5RRT2QflsprrjiLsRrEUrrlBvhLaG6jZ6vBgFItoPTJPcrE3/IVITEXTV6ZMFzvG65y+ Zyzn2DgzTvjwl8+krIcb/bTVc1toY97aAuc+u31iZbOJUOeoQLcbr7rQ0sty799wf8FJ rzUA== X-Gm-Message-State: ALQs6tCTiPZynDy7vD5C3U+g/SVoh2sDG9tJAcNYX27dluReS1q/RcQy xoLH/uoRvk1qsqaCalCgUh+Xp+yzQdg= X-Google-Smtp-Source: AIpwx48dveVE7U0Nfo8GpKZfGc9ndoN/uNZwCQVksKhVH3wmKft5aFuJ6/BNa6kbsJ5sq2P7kuuCdw== X-Received: by 10.80.230.12 with SMTP id y12mr33235305edm.278.1524575780116; Tue, 24 Apr 2018 06:16:20 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id q11sm9568786edj.2.2018.04.24.06.16.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:19 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Tom Lendacky , netdev@vger.kernel.org Subject: [PATCH] amd-xgbe: fix xgbe_xmit()'s return type Date: Tue, 24 Apr 2018 15:16:18 +0200 Message-Id: <20180424131618.3455-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/amd/xgbe/xgbe-drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index 7c204f05b..9dc263dda 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c @@ -1962,7 +1962,7 @@ static int xgbe_close(struct net_device *netdev) return 0; } -static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t xgbe_xmit(struct sk_buff *skb, struct net_device *netdev) { struct xgbe_prv_data *pdata = netdev_priv(netdev); struct xgbe_hw_if *hw_if = &pdata->hw_if;