From patchwork Tue Apr 24 13:17:12 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: 903473 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="a8LV87KJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkws2Gg6z9rx7 for ; Tue, 24 Apr 2018 23:40:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933851AbeDXNRX (ORCPT ); Tue, 24 Apr 2018 09:17:23 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:55445 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933817AbeDXNRR (ORCPT ); Tue, 24 Apr 2018 09:17:17 -0400 Received: by mail-wm0-f66.google.com with SMTP id a8so908578wmg.5; Tue, 24 Apr 2018 06:17:16 -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=QTqgqSGIXp2C9Drk5k1+5pR8sGOXq1BP9cWd1Re0GEA=; b=a8LV87KJHEawXrKvt5Ykx7IkIDntZP4YvENgejgs3BKST4RyWWnj/Bx7WbhP+x5Buh 6sa+R2urpWCkad1OvDUjlJ64k7fZZUJ0chaCt3X7AJ4twJKBSDY+oge2Zgr5RS3fvnHe /YiEvNR3vkjDoLJ4kInUQLd1m7of+e63CEulFEhCRPr/OD4bxsERW0oTX5JCYtudv5rh DXbwISrMNsjCzhjomCe06jwL/MgarkUCqh4NTsK6X3WGyxUknELrtqs8PffA5pu6hrgY l5/o6JnMRzpI9iIv2/rESo7jeviMXRnoGyTqIHVgidkVLKvLiAmYg8VKwR+U6YDXl348 GdMw== 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=QTqgqSGIXp2C9Drk5k1+5pR8sGOXq1BP9cWd1Re0GEA=; b=sR0k5/4oqMhZLAkWISjG9eTj6IUUzia8w7FU9E50cT8rb5qcVIYOFtSnKb8j1zI5UY tPiHZbUBtUjipXTWqLxhCfKDwctcx+/MH+cow6EdG0nV+4543InZEZ3NkvjaHHQ0VoVD D3jfHSUYBDk+2UwrRLafKBpDX2LOHxpmV6UNTz6lEuBNrRssRvn3rPyBF8Y6zDG5cASf 0ZK0xJAZSeV3kNHZsxo7JuMiAkPfpRJTRRq5UjnLzIovQMBkLQw+uHT7ZmC4Hnb+6XgJ tEE0buCWU4OZ/lBMiPdXIUQ0ZIW9f0Js5knKhjan7sKZxkRhyCXud9vD69Y+N3mrBqDk uodg== X-Gm-Message-State: ALQs6tCkAgDSvvl4UQfsWIPcR7NhS4pxuLHXi9c0OD+7kbsaGcQKSNAC JK21tgkDQ3VJJPIaMqa4omYLbz+e27A= X-Google-Smtp-Source: AIpwx493r1HyvyXxzG+wTZz99cyzrJBFEbk8tvTXL6b94qC8MmScbFJs1P5pYvrMIy9Hqvg+rtffdw== X-Received: by 10.80.161.165 with SMTP id 34mr27543552edk.273.1524575835805; Tue, 24 Apr 2018 06:17:15 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id d17sm9393335ede.65.2018.04.24.06.17.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:17:15 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , "David S. Miller" , Sinan Kaya , Bjorn Helgaas , Kees Cook , Andy Shevchenko , netdev@vger.kernel.org Subject: [PATCH] net: pch_gbe: fix pch_gbe_xmit_frame()'s return type Date: Tue, 24 Apr 2018 15:17:12 +0200 Message-Id: <20180424131714.4257-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/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index 7cd494611..40f7f9309 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -2121,7 +2121,7 @@ static int pch_gbe_stop(struct net_device *netdev) * - NETDEV_TX_OK: Normal end * - NETDEV_TX_BUSY: Error end */ -static int pch_gbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t pch_gbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev) { struct pch_gbe_adapter *adapter = netdev_priv(netdev); struct pch_gbe_tx_ring *tx_ring = adapter->tx_ring;