From patchwork Tue Apr 24 13:17:07 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: 903475 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="GdAc51XM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40VkxQ0HVLz9s02 for ; Tue, 24 Apr 2018 23:40:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934337AbeDXNkp (ORCPT ); Tue, 24 Apr 2018 09:40:45 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:52182 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933576AbeDXNRM (ORCPT ); Tue, 24 Apr 2018 09:17:12 -0400 Received: by mail-wm0-f66.google.com with SMTP id j4so909559wme.1; Tue, 24 Apr 2018 06:17:12 -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=w8+W8BKDr6PkwBegjmw3My5SnMdr/0sp434V6G61FCY=; b=GdAc51XMyHkSRDEri5XzDBg/yA2t4cr6Wldho29ktPXZ91GEJ2a6GkaHImAQf1iZ8s NhuV0q6xo2iMTacIda+2lWF1Gdm7lekVfXi4z+3ZiBNa7Iq4B5PEVAbpo9CWEN/OPWp2 ryWOTYxmjL5MWOXmXhzzrjaPKfUgtWjDbzzcSPFGS+WFizW56l4Ge0WotajXecn3udLs zVm9oiJclePHCO2F6YOO+XPqIqTgFB4jFQEqvEea3X2N2rC69/CaE2ClQbZZmzQjbBLQ dNq8snaZUPicTMJZo4zx0zmEfCmf2tTD3733xQ0IDSzZUWjTSW+i5stID9FVSO1P3gRD vApA== 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=w8+W8BKDr6PkwBegjmw3My5SnMdr/0sp434V6G61FCY=; b=oOg8L2Id2OQ4xxJmHaS1+WNp79behadWt3xJO0ydCyHEk3QC5VGmv06S298JnITmC1 rFmIwVUBrEYqXtoMAfXd2Hr46DoXeSD3d8t7y1aP/s6wOmRwHC6sah4NV4IYeuHcWVyO 0LQda9CHgL3c6v3tssbFFs+8Igw4t83oj23Eall6Q0HKbTp4YshvhtIX/UaeqIGxldbs iEIx4GbrFdhdenR4wNAI8B72K7wwainNPYLIpKOJ2kxBwrpGTwUbCz63opKrdnBsl4mB KsMBc2rCG2HG8DwzmyXzjhFnbUEwlDIt7V90n75FY3SMFEgLbu+AdYUrGb8nsJlZGQgC 0tYQ== X-Gm-Message-State: ALQs6tCfdWriYtLjoxzBppWDFTN8by6ldfGAyrrqoq8JX9bdp9A4UoEC TCBe59hRcgzeAZu9MJeBLjeVoAZfhgg= X-Google-Smtp-Source: AIpwx4/QDp1OqieTQFYvRAL+EiQSA6V1sz/F814D54IziDKEbEWImTv8NAGzE7sXWltsk8JoDHNM2Q== X-Received: by 10.80.185.1 with SMTP id m1mr30237645ede.214.1524575831452; Tue, 24 Apr 2018 06:17:11 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id h30sm6813126edh.73.2018.04.24.06.17.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:17:10 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Jakub Kicinski , "David S. Miller" , Simon Horman , Daniel Borkmann , Dirk van der Merwe , =?utf-8?q?Pablo_Casc=C3=B3n?= , oss-drivers@netronome.com, netdev@vger.kernel.org Subject: [PATCH] net: nfp: fix nfp_net_tx()'s return type Date: Tue, 24 Apr 2018 15:17:07 +0200 Message-Id: <20180424131710.4206-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 Acked-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 1eb6549f2..4e6aaf678 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -794,7 +794,7 @@ static int nfp_net_prep_port_id(struct sk_buff *skb) * * Return: NETDEV_TX_OK on success. */ -static int nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) { struct nfp_net *nn = netdev_priv(netdev); const struct skb_frag_struct *frag;