Received: by 10.192.165.148 with SMTP id m20csp4674256imm; Tue, 24 Apr 2018 06:43:49 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/AFacDeefznp3Q7ZhSENnOSv24aloCRrLZPbWsT++R1hLXSoFdXStb/6W/0WFQFcx2iKCe X-Received: by 2002:a17:902:8d98:: with SMTP id v24-v6mr24717076plo.146.1524577429124; Tue, 24 Apr 2018 06:43:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524577429; cv=none; d=google.com; s=arc-20160816; b=MrU2h2epLaAWN1NgUZoKzx0Z1/uYz4x0jalxl0g/x6bfrP7q8Jm0qBM5rLjEdsf/Ru D0l8MDyPpvtQFP43ysFUvOQ8nBc4qjCPGq0J9n/t2NiyDSxD2TKJu96QkL+ugqZxJb1Q wpA4/vVPy3WESyIH/CY6zkMb/O9eZxjB4dOCcKCEUg2amJMTo2tk9ePJVy2qtNDZZTwU RXKbYlmvqwGIGS61n+Dpa74WzLnN//2Ct4jobqn42G9am/+VeJIW/l8cD7AxFI1bTyHg ylebUPqNO/4qoxtu6LxgMwbJ6IPd+lOyZOwZ/6/dd1yyQYYmI3DovoMycWOk2mVsVh2M aTCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=la6M8Ca6pcf+t0QhBYu33T1dtPcrmNLh8ULWYecruN0=; b=QCZq/wjz3FGdJLMRB5YiVxbLiGdyQv2qrr1RgEdRMXj4PSvgWZJ+EovEOlB6hYBFkk KMPxrxv5UtJlXwX2wuXR2uBCtI7HkB5hlcpdiWdD5FdhRncCHJgD+NDNmG2RcLw3vdqk NPb1OE/A/Up7SUungV2n3weqHUByfdHJYSiaGSmqJkjrW/bJgzRWttsYbdCnZCgVSs4M MfqsFiU4pibLoMfnrCzhhPbToh4JCEQW7OIatwoh1Gqngyqhq6vh2UeMPDlKl4p9qX88 rEj9BYjb+ojWTlxHNxpP7PNEx/D7qfnT21F0FAENoi9YuOUD3jTplA6z7WomTrZRoDWb zhvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=qQ8Fs3Ey; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z21si12118083pgn.570.2018.04.24.06.43.34; Tue, 24 Apr 2018 06:43:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=qQ8Fs3Ey; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933818AbeDXNRH (ORCPT + 99 others); Tue, 24 Apr 2018 09:17:07 -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-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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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); -- 2.17.0