From patchwork Tue Apr 24 13:16:41 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: 903481 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="mRDQ51xr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkzm3M8Qz9rx7 for ; Tue, 24 Apr 2018 23:43:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933855AbeDXNm6 (ORCPT ); Tue, 24 Apr 2018 09:42:58 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:56298 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933724AbeDXNQp (ORCPT ); Tue, 24 Apr 2018 09:16:45 -0400 Received: by mail-wm0-f65.google.com with SMTP id a8so904724wmg.5; Tue, 24 Apr 2018 06:16:44 -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=AVLN0kVl4iSEmxZ0MfRb6bNKbcATsgBe9wZQRaODLzc=; b=mRDQ51xrr8t0+g3k1di/kQgfLlSgW4LauoCoQOTv4yUPvcxlLREOpHPngRm6wc/l/M aoLnuISmcNA0xhZaTpZ8+QdWkLd+NJAGhUdWksyY1GFeazsdqbLwI4KXG4RQ9P1PRKVv sKtFUkTJlSYDkBlck6TqHUp4HrkgAiNnsvE+YvJmL2D1oOMeKyH9LvWPN0h+/6JuTleT E16Co3PyfF1LBLpfqRh1xhI1kwCmWAbp/Wx7P6yee5ij7KzlqEXp9zq9wNawkRrj7Wlr XDjRIRd++YAfE745y9PC7qXiOhvwY9VBhC53Z209uZOg0g3wlowkFqtuYnV0fwlciK3U Sigw== 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=AVLN0kVl4iSEmxZ0MfRb6bNKbcATsgBe9wZQRaODLzc=; b=Mk1+QYSlCi32hPidDcmEn8gwR8apwTz9poeYtlgLgJCfWHPr99IlyMlsKuH0ENdpP9 bVcsKTZWQ3HH0N91qs08Dx5xkUNBZqoul7hVu0B9vFBUfPRSje12ynVbvhzeATgpvMIh xPnJCtQ9idm4XW29SJBKmcdjp31B9YHuuX8Ou+Culw2orKQEpCWJuXz9kfAZRKB+y72e fLVhSktlAtAWhIT4NFzHr9dENVrnpKhhA4EOE4SfIMWe/i4e0oQ3X839yT6MMFsUj1rx A0JKLfcNkF9wkjv3Mk/KB3F1yravT05BMyRhdJObbh9YcxxZFuDb62uIQdbEpIZNaHTY xVmA== X-Gm-Message-State: ALQs6tA5oPZwGxPCpxgiHNcMc46EKrg6j1tJJ1tIcQ0j493eKC9H/gk+ kKzFe/paeSw1+Wo1cvh+qaFwftLOKOc= X-Google-Smtp-Source: AIpwx49uY5NgY3KE3/nNcE7p7X3BriAkpn5frDj4mS3n/JUQMbbBWYwHcgiCasAsWoEhaSFxuYMHFw== X-Received: by 10.80.153.83 with SMTP id l19mr33842382edb.179.1524575803545; Tue, 24 Apr 2018 06:16:43 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id g59sm8628406ede.60.2018.04.24.06.16.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:43 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Hans Ulli Kroll , Linus Walleij , linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Subject: [PATCH] net: gemini: fix gmac_start_xmit()'s return type Date: Tue, 24 Apr 2018 15:16:41 +0200 Message-Id: <20180424131642.3806-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 Reviewed-by: Linus Walleij --- drivers/net/ethernet/cortina/gemini.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c index bd3f6e4d1..564b9ceb1 100644 --- a/drivers/net/ethernet/cortina/gemini.c +++ b/drivers/net/ethernet/cortina/gemini.c @@ -1188,7 +1188,7 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb, return -ENOMEM; } -static int gmac_start_xmit(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t gmac_start_xmit(struct sk_buff *skb, struct net_device *netdev) { struct gemini_ethernet_port *port = netdev_priv(netdev); unsigned short m = (1 << port->txq_order) - 1;