Received: by 10.192.165.148 with SMTP id m20csp4675543imm; Tue, 24 Apr 2018 06:45:03 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/QTZyaNAWJVdCZkGkYjHLwpRodtFevtrjUQ1zjSaJ9zHF/UcrBZAMcC0R08DWERcLmXvIF X-Received: by 2002:a17:902:343:: with SMTP id 61-v6mr14104973pld.39.1524577503538; Tue, 24 Apr 2018 06:45:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524577503; cv=none; d=google.com; s=arc-20160816; b=z/W2cH4omZbVwAXPlH98pzRcdsijwGDVGSnyZq685Sd5EPNsVVCiBsBEUTkG9rCF8g SktGKkmzLu4/oZq3wq1ocMvg4nRD/sTvCK1R4YfuTtw7u7JWgywg27EGLR9T9zrGEYFc K7RR6sqgwWkTocJ3zQ7DjYHLsuRBalGSYWqC4ruU09ca4rp0+GiomyBb4huFf/6SPgis EaN0IsY5QGzNsUK4mQqNKbdZP2zhepg7X9y8VOlkx9wtKkMcXujJkEtuYBujPvQowzWZ yIv3vJ4k5sjughkaa0Jkau65+8q/z0fuWvDD40PYL3YZ6ub40G7nhHN6HuzR5Yp4EiI8 kh3w== 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=AVLN0kVl4iSEmxZ0MfRb6bNKbcATsgBe9wZQRaODLzc=; b=WPsZBhBb62KNJzFiwimkWOgC/JY6xWPt1MKmQSdQiTUacDAsbj9KXx9z0+g3do4IlM KwxBGb5/ZcmWcHHQXipEPYeoaMT5LF5ssYb/LUmFyplC0MPwqho+78gOTbai1mnLe2L0 wD682jqpQZ+0CbK80aSoRjE473+DpRquLWxDTYN1FdH7jLg2YbELA5sElCj4G37te0E9 wcEuJW8i/1j/B77GoOWhF9f5dqt6plxG62/odTR/kIETu+5lmshkczF/0hggUIudXuK9 Qb3n0KEqa7KUUNSQE8+SwMLKilEWlkaeRAZ/mvLPk22HS20zk5im/jMpOSw6mN2QmCD6 fhgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=mRDQ51xr; 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 y3si11350778pgc.601.2018.04.24.06.44.48; Tue, 24 Apr 2018 06:45:03 -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=mRDQ51xr; 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 S933862AbeDXNm7 (ORCPT + 99 others); Tue, 24 Apr 2018 09:42:59 -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-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: 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/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; -- 2.17.0