From patchwork Tue Apr 24 13:16:51 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: 903434 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="qQ8Fs3Ey"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40VkPt3qKjz9s3R for ; Tue, 24 Apr 2018 23:17:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933791AbeDXNRC (ORCPT ); Tue, 24 Apr 2018 09:17:02 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:39607 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933576AbeDXNQy (ORCPT ); Tue, 24 Apr 2018 09:16:54 -0400 Received: by mail-wm0-f65.google.com with SMTP id b21so804672wme.4; Tue, 24 Apr 2018 06:16:53 -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=la6M8Ca6pcf+t0QhBYu33T1dtPcrmNLh8ULWYecruN0=; b=qQ8Fs3EyH8+u6WDoaoU0QdPAWjrGG15UpidYjnMMTffbJoizy6Uhu+C6FDb93WQX1+ x6e88dS+MuiF3iIAmbnVfaPyZqxMM6X7X8O/J310XpR2lsQol/6B/3gQSgO5oNSUuiAq ZkQloh35I0aVjGOlnxFKo5xTue2k2HemjbOUjrbifX2z92l2KsysUSl/CIrRdlgBcdmd NfjCGVmqWgrXF/IIUb6iQd7RKCSgLjFFg9gVR64v7T8SWH5akFcNJM6Ggs0gkSwwOCFl vI8vGnoZp1IOiUlsWrVnGxNHCbpFx/0rzyVQx6ptcW5jW5FwxKXLOtnQBjL+FQYbFh0O j/pQ== 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=la6M8Ca6pcf+t0QhBYu33T1dtPcrmNLh8ULWYecruN0=; b=lVcdfzvDq6SkHNJ0uNAredntHu4qPc6UU6Y+LyOBn3kEkD76xI69Q7xdxsnwNRnQVP AXEB6FTvIqItDeVCG7MFIC6jXFX0VTPf4YQfct0xqnlamJE+BppJ2QHWOAiR1cG11XbF yKQerqD2bNNZKbz/zirxuXnKHaMFqvSyh0cWYpS/tK2fge4bCsMndCsYlPrTa/XzRaOY Ws5kdkH9TL7Ojib0RF7iK9PXOpRoRd5D6YVdiw1vg6cYAvLEcgdPJM8MTx7Wi3Pz42ry oBYxlTTvqEJTQEhtRsKlAzVrqKHlTuff04tFrLkQSBx/NVE6+NcC8sCg4eFI2cKchbrN sAaw== X-Gm-Message-State: ALQs6tC0JRzGlhvBENczuht+yOPUv8CzPjXINXmATLxZ4X6iTiCimnvr 6DlXxSDkXA85z816n7fBwAbJ3WyHOO0= X-Google-Smtp-Source: AB8JxZoNB8UBvwjGxt62/bFUgphrIyDWcPI3p7/YXpqewF8se8dZ45r86dHkVXZxJvuoFqrkelJZNg== X-Received: by 10.80.163.6 with SMTP id 6mr1172280edn.292.1524575812730; Tue, 24 Apr 2018 06:16:52 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id q30sm9173231edc.93.2018.04.24.06.16.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:52 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Thomas Petazzoni , netdev@vger.kernel.org Subject: [PATCH] net: mvneta: fix mvneta_tx()'s return type Date: Tue, 24 Apr 2018 15:16:51 +0200 Message-Id: <20180424131651.4004-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/marvell/mvneta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 17a904cc6..436219e1a 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -2322,7 +2322,7 @@ static int mvneta_tx_frag_process(struct mvneta_port *pp, struct sk_buff *skb, } /* Main tx processing */ -static int mvneta_tx(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t mvneta_tx(struct sk_buff *skb, struct net_device *dev) { struct mvneta_port *pp = netdev_priv(dev); u16 txq_id = skb_get_queue_mapping(skb);