From patchwork Sun Jun 28 19:53:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 216952 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE466C433E0 for ; Sun, 28 Jun 2020 19:55:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B87F8206C3 for ; Sun, 28 Jun 2020 19:55:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kleefZaA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726828AbgF1Txr (ORCPT ); Sun, 28 Jun 2020 15:53:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726718AbgF1Txp (ORCPT ); Sun, 28 Jun 2020 15:53:45 -0400 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06804C03E979; Sun, 28 Jun 2020 12:53:45 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id n26so571929ejx.0; Sun, 28 Jun 2020 12:53: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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y+i0IcQsjWmXQ0Pd6Qvx5hq3ZReJQOfTWgZO3faohco=; b=kleefZaAJFV8BacB1VKjG3AIfuhS4INVMz6/+kI0fPD4iIM0g/IjeC3POUHOv6FTwN hNYo4XHTMBmsMVnuzlA07ubgWzBEss7GAvN6sgwk5ZJrwaa7YQvc1Ow0dfC9fJZXhoTI JXChNFwplDJFSK4qkvrhN2Mz1jd/uJNkGIrQ0rsWaX/SVrzI1VFOToURkM1NT01kzBPf ycX5Zjyxdm7nR56wNBqylO7ZDPkw4leKsLSayY3oeuQpcl5fWm8iZmsizD/E70nb1iNs AQZwNaKBoZdcPBTeXuequSmGotiabYM8ivVD0Y8JU8Sb0fbihOU8jkQY2rNvQJDLpEeX /SiA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y+i0IcQsjWmXQ0Pd6Qvx5hq3ZReJQOfTWgZO3faohco=; b=sLA+j6+aP+r8NZ80vzy2tT9oxat2FiZn1SdVPTFba9XSNu13JVoFT1UtOeuarE4cUE WmlD8gLRyzwI1btu3FSz0MAsfTDKKUbdd8wxKvefE3QWyEHrSlrsDmYZQt4khiMWV0Bp CFU+dTttiCVLsd4YtkvVF7vfgJVvkoXIkYlYFtdZ+EWQfRCK70KRlgWd5sQY8T0OIuVO BzY9RgS+r6nC9o339CRlTkn374cqmj6vOJ0ge3kQe8AjUNVP8T8d+ILvt5NAT6tP4rU3 MsMbwxbHzZRCFJ11j8FAdxREbo3jYBV9WDAliFx25+azypRw7bbxb0vIzfhGXvSmMIZU b+yg== X-Gm-Message-State: AOAM532QIO3Sn6tX+PhSHuf6NID9pSxbBJTYD/J4N8jnBL037O3ucJCb YF994iml+LvjebWdq+4iJno= X-Google-Smtp-Source: ABdhPJz1OupfKH5ObS1ezsMLqwdLjr4hCUvdfovj9vXUgcUJCtWnju4d2Luxvr/MiHaQiFsA/Ev1Fg== X-Received: by 2002:a17:907:20b4:: with SMTP id pw20mr11656101ejb.225.1593374023577; Sun, 28 Jun 2020 12:53:43 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:b7f9:7600:f145:9a83:6418:5a5c]) by smtp.gmail.com with ESMTPSA id z8sm15669531eju.106.2020.06.28.12.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:53:43 -0700 (PDT) From: Luc Van Oostenryck To: "David S . Miller" Cc: Jakub Kicinski , netdev@vger.kernel.org, oss-drivers@netronome.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Luc Van Oostenryck Subject: [PATCH 01/15] cail,hsi: fix cfhsi_xmit()'s return type Date: Sun, 28 Jun 2020 21:53:23 +0200 Message-Id: <20200628195337.75889-2-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200628195337.75889-1-luc.vanoostenryck@gmail.com> References: <20200628195337.75889-1-luc.vanoostenryck@gmail.com> MIME-Version: 1.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 and returning NETDEV_TX_OK instead of 0 accordingly. Signed-off-by: Luc Van Oostenryck --- drivers/net/caif/caif_hsi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c index bbb2575d4728..4a33ec4fc089 100644 --- a/drivers/net/caif/caif_hsi.c +++ b/drivers/net/caif/caif_hsi.c @@ -1006,7 +1006,7 @@ static void cfhsi_aggregation_tout(struct timer_list *t) cfhsi_start_tx(cfhsi); } -static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t cfhsi_xmit(struct sk_buff *skb, struct net_device *dev) { struct cfhsi *cfhsi = NULL; int start_xfer = 0; @@ -1072,7 +1072,7 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev) spin_unlock_bh(&cfhsi->lock); if (aggregate_ready) cfhsi_start_tx(cfhsi); - return 0; + return NETDEV_TX_OK; } /* Delete inactivity timer if started. */ @@ -1102,7 +1102,7 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev) queue_work(cfhsi->wq, &cfhsi->wake_up_work); } - return 0; + return NETDEV_TX_OK; } static const struct net_device_ops cfhsi_netdevops; From patchwork Sun Jun 28 19:53:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 216954 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57DBBC433E1 for ; Sun, 28 Jun 2020 19:55:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 318C42053B for ; Sun, 28 Jun 2020 19:55:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="s5sJzU+W" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726892AbgF1Txw (ORCPT ); Sun, 28 Jun 2020 15:53:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726824AbgF1Txr (ORCPT ); Sun, 28 Jun 2020 15:53:47 -0400 Received: from mail-ej1-x644.google.com (mail-ej1-x644.google.com [IPv6:2a00:1450:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E6F4C03E979; Sun, 28 Jun 2020 12:53:46 -0700 (PDT) Received: by mail-ej1-x644.google.com with SMTP id i14so14511919ejr.9; Sun, 28 Jun 2020 12:53:46 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Lytj8JREnMITA3Qx/LJdVYiI5LTDssfwED1xOl5FxoM=; b=s5sJzU+WEEpr1/XqsXUOXsZ9DleB4kE2Itb7EK9Sfi0VoP/AqFQGI+MLcqPnlR65MT UJhYLCBCsgOHo1CfSN4DablGz78ThZgMvlq4sJceEM4kqx7lnE8eA9ixrBdVnPa4ZDO/ u12VYqMCP6Cmh0/ntMEzxo12eBiAfRrgOktn3JHB3M82qnIovlpkcNv0f5GQwphsoINY 1IrgAEuaMlJgrLXQCUivQTQ3QC47ObIOqo4ZLJKRQCapLEt43KxdqFzqaPz8tonp1Wy6 doCl3XS1oe7IorGTSnMGHkVVDA6vzPBAopIVuJYNhBtWGV2XidswvWOm5uRMquxQiVvE 73Cw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lytj8JREnMITA3Qx/LJdVYiI5LTDssfwED1xOl5FxoM=; b=jgRncCqEDk9FuqT3GDS6xQzuwLAWQEVnw/TgHcPmqnPOl+DgvLlXMfhhvo75VNwj7Q 9bEFAW/7B8wqc07I7rW7CGYLdcnxGMjYZw9e0B3/jrn1yYExJ7SZD7vyWqlYc3oPmUin +aAaltarHZax5IZ2nxpVpTxHQxxjPFgZfSFfk9fuo0Tv4OBwB9aMzaw6fA2MrBZY6hgE fID1fprh9Zc6groc/Tz5QWCBPgjDFsYfXHPxQ0iHlQflpfUdbhsDMJLGcS7XMc9io55t jaiOCBf/QpiGOGp8Cj4w8GScBpDQ/QIMjk+6pi7dxtfDU3aFLm6PugDpPXDsZacu1Mn9 OUsA== X-Gm-Message-State: AOAM532lnodzoVIrGwPDlOHHRyHua1A2s2DqFZjuqqGDXPse6F6gaWhg mAyfBmr2JuneRivIhCIFcDQ= X-Google-Smtp-Source: ABdhPJyFGjpjxauvlOMVPeyy9QgZWnFiQZg1zetVmwhixDKXtyZ7aTWen5+dnV6Ij3PL3Tb51BHdlw== X-Received: by 2002:a17:907:72ca:: with SMTP id du10mr11055838ejc.78.1593374025363; Sun, 28 Jun 2020 12:53:45 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:b7f9:7600:f145:9a83:6418:5a5c]) by smtp.gmail.com with ESMTPSA id z8sm15669531eju.106.2020.06.28.12.53.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:53:44 -0700 (PDT) From: Luc Van Oostenryck To: "David S . Miller" Cc: Jakub Kicinski , netdev@vger.kernel.org, oss-drivers@netronome.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Luc Van Oostenryck Subject: [PATCH 03/15] caif: fix cfspi_xmit()'s return type Date: Sun, 28 Jun 2020 21:53:25 +0200 Message-Id: <20200628195337.75889-4-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200628195337.75889-1-luc.vanoostenryck@gmail.com> References: <20200628195337.75889-1-luc.vanoostenryck@gmail.com> MIME-Version: 1.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 and returning NETDEV_TX_OK instead of 0 accordingly. Signed-off-by: Luc Van Oostenryck --- drivers/net/caif/caif_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c index 63f2548f5b1b..7d5899626130 100644 --- a/drivers/net/caif/caif_spi.c +++ b/drivers/net/caif/caif_spi.c @@ -488,7 +488,7 @@ static void cfspi_xfer_done_cb(struct cfspi_ifc *ifc) complete(&cfspi->comp); } -static int cfspi_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t cfspi_xmit(struct sk_buff *skb, struct net_device *dev) { struct cfspi *cfspi = NULL; unsigned long flags; @@ -514,7 +514,7 @@ static int cfspi_xmit(struct sk_buff *skb, struct net_device *dev) cfspi->cfdev.flowctrl(cfspi->ndev, 0); } - return 0; + return NETDEV_TX_OK; } int cfspi_rxfrm(struct cfspi *cfspi, u8 *buf, size_t len) From patchwork Sun Jun 28 19:53:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 216955 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 256D7C433E0 for ; Sun, 28 Jun 2020 19:54:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F19882053B for ; Sun, 28 Jun 2020 19:54:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XRdwSXBg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726906AbgF1Txy (ORCPT ); Sun, 28 Jun 2020 15:53:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726834AbgF1Txt (ORCPT ); Sun, 28 Jun 2020 15:53:49 -0400 Received: from mail-ej1-x644.google.com (mail-ej1-x644.google.com [IPv6:2a00:1450:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD15CC03E97E; Sun, 28 Jun 2020 12:53:48 -0700 (PDT) Received: by mail-ej1-x644.google.com with SMTP id w6so14532239ejq.6; Sun, 28 Jun 2020 12:53:48 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=GAh3jR68wgJM9kQ3sHQbEk56iwElaVOIR9OPU/4rPds=; b=XRdwSXBgrLhj2utqI68nf8GOh4/SkU9hSeBQT+V+0n991mPG73mnDlgaL0RHwSQOIx WY84aTP9jlZCgoMS8UzntBhTMtS+xkOsCsdIHsKFVhzU5x9ds47KUYYzprNC3DEDrLz5 +uNBGpum4mkdbE2rlRCeEI1IoFIvQ88q5NKUxsULntdztZJkvfHKWVd+JzcdBK5vnJGD PPtePaxP7WWoZIknYo0WpkJIjQrtkEx0CdWkUqqAmc5tsfPJOd2x1bcSG0JPknJrWr+g 4NnEtyGn2XqHJfg60ILF2E0ADb6oGGZ4EeXNHj2YWAQKXCNtqkF7+eLmlgEHWygLEqro IzGg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=GAh3jR68wgJM9kQ3sHQbEk56iwElaVOIR9OPU/4rPds=; b=Bnr27tl6QduzqTko2Y7U8ZtIzk8J5kBiYTF8PQ+amOJpyH/rHlsQxyIfwJFF0lmHMZ mcNghyAbouFDWoncbrZkPaOefa7u9fpw4t7owLJ1jWxXK1WXbU6qTcfZcmt+bCHsQJ0x eC4XqXE+7jmElsaMS4vxrqcNpbWkCJ+OqwsgudV79oA5gQ/ryhjPnfbC5MR4QW5Joayl 5lzDwcnHXx3TEOhBNeV84C5bu70Z/bjwSrAsPspPaFna1zRLNaWRFf+TKdnmf9YNswbs CIV1V1XCeesYP6k/NHl5VmMocPA6NZa27zpr6N382CPzlzdlFAcE7/+QhUvspjnlTEXb IVbw== X-Gm-Message-State: AOAM531cGznEcz5oU4aaUmuTYh5GeFPFIdsVJxw1Cn8X86xXe0Y0EtBJ qa3yp7GbyVfpJb/JWrLRsVY= X-Google-Smtp-Source: ABdhPJwGie1cbQx6Vz03PllFxAbz5fc1wX1U1xnNJLGeVBST0inZZLqC6iSWnxJA9AWA9KcgrZz2jw== X-Received: by 2002:a17:906:c10f:: with SMTP id do15mr11773252ejc.249.1593374027553; Sun, 28 Jun 2020 12:53:47 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:b7f9:7600:f145:9a83:6418:5a5c]) by smtp.gmail.com with ESMTPSA id z8sm15669531eju.106.2020.06.28.12.53.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:53:47 -0700 (PDT) From: Luc Van Oostenryck To: "David S . Miller" Cc: Jakub Kicinski , netdev@vger.kernel.org, oss-drivers@netronome.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Luc Van Oostenryck Subject: [PATCH 05/15] net: aquantia: fix aq_ndev_start_xmit()'s return type Date: Sun, 28 Jun 2020 21:53:27 +0200 Message-Id: <20200628195337.75889-6-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200628195337.75889-1-luc.vanoostenryck@gmail.com> References: <20200628195337.75889-1-luc.vanoostenryck@gmail.com> MIME-Version: 1.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/aquantia/atlantic/aq_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c index 8a1da044e908..6c85005cd2e9 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c @@ -94,7 +94,7 @@ static int aq_ndev_close(struct net_device *ndev) return err; } -static int aq_ndev_start_xmit(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t aq_ndev_start_xmit(struct sk_buff *skb, struct net_device *ndev) { struct aq_nic_s *aq_nic = netdev_priv(ndev); From patchwork Sun Jun 28 19:53:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 216953 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F22E2C433E0 for ; Sun, 28 Jun 2020 19:55:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CCA63206F1 for ; Sun, 28 Jun 2020 19:55:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tpZRnsO/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727102AbgF1TzL (ORCPT ); Sun, 28 Jun 2020 15:55:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726871AbgF1Txu (ORCPT ); Sun, 28 Jun 2020 15:53:50 -0400 Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 527A5C03E979; Sun, 28 Jun 2020 12:53:50 -0700 (PDT) Received: by mail-ed1-x541.google.com with SMTP id h28so11146592edz.0; Sun, 28 Jun 2020 12:53:50 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=pCi2aD3tv5ST/a/DsPqPX7Y3piJk+0Ealzz1YbxZv30=; b=tpZRnsO/eN+KxN0fx3K5tOgplIrKMno2Ja9sH5yGG3MtFuoxdL5lLYGSHOh/Xe4wVy dCvqI5w8Y5oxOWmCd1FhG3MAuceDn2mq63E4dgpcrZcORTeH8bo+kmfmmQB3y3Mn6GIw ljx9qO+qgRxtzORKNYp1eefK2LCJiQv5U3LXWdu+GgIa04hKGYTULr384Gx7YHB2TQDu HxtQJJw/uXsnSqmpJ6nERHVMrmBC+PEevlnFMI8tZ7d67qv2DCaY+Cvh33RT807VuboO Iz2ZHDcV3QDheWWcWFyhvTblJk+dYdovEEhDfmnnMVneTQzNVumXL8nAJ8mrByTbiUqw WkvQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=pCi2aD3tv5ST/a/DsPqPX7Y3piJk+0Ealzz1YbxZv30=; b=GK43PVxnYpCLNk/6jQpwKGtlaPiyWrq9n0rxVPjd2mNBqzXf4u5qLPM7gMDyP28xc2 xty5CWpHw9IZH1SEm0tPBMdUtNLSLQMPitCT1zE4L+hrbQDKwJ7Y/NI4lDnGPApnRNUf G+ffMndld9WtG+3N5SXx1kdWWBcmPv1lWalZ5tDpo+pvKF+TU53Eh7QmShpSw+RhqpSd ztMaIUMVgE0oqVbGQkIACrwvTtQSTewBCOykQDcUG190TJ1dq08rVNkZYmcZUE1JbE42 fcJsocpVB10mW/JGDXNj2qryxonSY6Oj9niC9MpQzvFTAPRQneh9MKed2fS13/yJoUV3 JHrQ== X-Gm-Message-State: AOAM532JSGv1k1ohBO75KtRFsKt1oDD7RRZ/bgRQBvZgARz50e6EqAAZ I1+DxVXUNh/AzobhdX4C1Fg= X-Google-Smtp-Source: ABdhPJwbJADA1syV4LLKf41oJs+nJMUDIZNnLfCgYxz3265iuheg5lFIWOHOdYkb7UbO1Rt9KlfTPg== X-Received: by 2002:a50:ef10:: with SMTP id m16mr13666297eds.206.1593374029142; Sun, 28 Jun 2020 12:53:49 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:b7f9:7600:f145:9a83:6418:5a5c]) by smtp.gmail.com with ESMTPSA id z8sm15669531eju.106.2020.06.28.12.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:53:48 -0700 (PDT) From: Luc Van Oostenryck To: "David S . Miller" Cc: Jakub Kicinski , netdev@vger.kernel.org, oss-drivers@netronome.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Luc Van Oostenryck Subject: [PATCH 06/15] net: arc_emac: fix arc_emac_tx()'s return type Date: Sun, 28 Jun 2020 21:53:28 +0200 Message-Id: <20200628195337.75889-7-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200628195337.75889-1-luc.vanoostenryck@gmail.com> References: <20200628195337.75889-1-luc.vanoostenryck@gmail.com> MIME-Version: 1.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/arc/emac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c index 38cd968b6a3b..b56a9e2aecd9 100644 --- a/drivers/net/ethernet/arc/emac_main.c +++ b/drivers/net/ethernet/arc/emac_main.c @@ -673,7 +673,7 @@ static struct net_device_stats *arc_emac_stats(struct net_device *ndev) * * This function is invoked from upper layers to initiate transmission. */ -static int arc_emac_tx(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t arc_emac_tx(struct sk_buff *skb, struct net_device *ndev) { struct arc_emac_priv *priv = netdev_priv(ndev); unsigned int len, *txbd_curr = &priv->txbd_curr; From patchwork Sun Jun 28 19:53:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 216958 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C93CC433E5 for ; Sun, 28 Jun 2020 19:54:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D0B42053B for ; Sun, 28 Jun 2020 19:54:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RSBTdQW8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726962AbgF1TyB (ORCPT ); Sun, 28 Jun 2020 15:54:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726924AbgF1Tx4 (ORCPT ); Sun, 28 Jun 2020 15:53:56 -0400 Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EAB5EC03E97A; Sun, 28 Jun 2020 12:53:55 -0700 (PDT) Received: by mail-ej1-x641.google.com with SMTP id w6so14532413ejq.6; Sun, 28 Jun 2020 12:53:55 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=lG9S6rgc6S6pXat0eM+7/QoqnspqcoylWLbEJTWZuTA=; b=RSBTdQW8TfOZ6oE8hWinHSh4w1/3phHfHSs8L93fVaBW9cxnPtsmfMaT6lLhyyRm8t N+in1akzVu4Si6Rr98Zq5kXDFEuPnOAkRKyAYd2KFzqvgZhljD+Jc1jeQFbhosUxQAqt XTnEHXLuHDah/Q7O7jwN3gDxcF1x0RUPP8U5P5jho8nhkdg8t9DSkbpuCVaSl27CvYgY Cy10Wr0TQ/B25KbZnuW7bxdb8fSMqvFcqPELJ5LQ+4bpkFuFA9hi8b6N0i2fWnwtoJSW ViuQHhfJGCbe6c4Mm1tI8uSBFHAi9r1g+VVjoG6rry4KzLZtdfWUBa52JtJfA7tixpf+ jy9w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=lG9S6rgc6S6pXat0eM+7/QoqnspqcoylWLbEJTWZuTA=; b=mXkRsTs88/p2EO/7lgy3L3qNnh3/huF/wX8q3paDfCA1hpYG2jBZdO0JBuA8S6EPC/ FRxhw+ip4xb7KstBoKk+kinxVRSkQ8FRlYDLYvluKP6c2f/6BjwWRjBJT8d9FxTgJuuR 2i5Sc+loLYtOL62a4hPgzo5N0kPPtS7RXfVmqdcHoQtG1itAJcJOtu8v4NSuTJwr2rTr XI+P58WR+C429atSfHdhCToA83+MJQgK29bApax5NRdzESuB2qEUz49aOdJHiQr6RJrC dy8cgsmVYSRTlC59/AyAl4Zb8dNHU+swpdc+xzH4Bo+UpoiZjLlsXhyar3j4EGXRPZc4 NXMg== X-Gm-Message-State: AOAM530pPo2ccrsvXpqNdQmt/Rng1AmPmJWACwqStKm26FD+XaE+Wb1n G7IHLWTAafZrSMLDBKrHdE4= X-Google-Smtp-Source: ABdhPJzFTsjHxDUS0X+9s1aMZdMme6m9QCTGIdVRVOluKrLNEQRpGod5gH/ba3CPWAvfc2zXf0iqaw== X-Received: by 2002:a17:906:7751:: with SMTP id o17mr11775877ejn.111.1593374034751; Sun, 28 Jun 2020 12:53:54 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:b7f9:7600:f145:9a83:6418:5a5c]) by smtp.gmail.com with ESMTPSA id z8sm15669531eju.106.2020.06.28.12.53.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:53:54 -0700 (PDT) From: Luc Van Oostenryck To: "David S . Miller" Cc: Jakub Kicinski , netdev@vger.kernel.org, oss-drivers@netronome.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Luc Van Oostenryck Subject: [PATCH 11/15] net: plip: fix plip_tx_packet()'s return type Date: Sun, 28 Jun 2020 21:53:33 +0200 Message-Id: <20200628195337.75889-12-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200628195337.75889-1-luc.vanoostenryck@gmail.com> References: <20200628195337.75889-1-luc.vanoostenryck@gmail.com> MIME-Version: 1.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/plip/plip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/plip/plip.c b/drivers/net/plip/plip.c index e89cdebae6f1..d82016dcde3b 100644 --- a/drivers/net/plip/plip.c +++ b/drivers/net/plip/plip.c @@ -142,7 +142,7 @@ static void plip_timer_bh(struct work_struct *work); static void plip_interrupt(void *dev_id); /* Functions for DEV methods */ -static int plip_tx_packet(struct sk_buff *skb, struct net_device *dev); +static netdev_tx_t plip_tx_packet(struct sk_buff *skb, struct net_device *dev); static int plip_hard_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, const void *daddr, const void *saddr, unsigned len); @@ -958,7 +958,7 @@ plip_interrupt(void *dev_id) spin_unlock_irqrestore(&nl->lock, flags); } -static int +static netdev_tx_t plip_tx_packet(struct sk_buff *skb, struct net_device *dev) { struct net_local *nl = netdev_priv(dev); From patchwork Sun Jun 28 19:53:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 216956 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62470C433E0 for ; Sun, 28 Jun 2020 19:54:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38E60206F1 for ; Sun, 28 Jun 2020 19:54:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ToEHJ4P7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727050AbgF1Tyf (ORCPT ); Sun, 28 Jun 2020 15:54:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726929AbgF1Tx7 (ORCPT ); Sun, 28 Jun 2020 15:53:59 -0400 Received: from mail-ej1-x643.google.com (mail-ej1-x643.google.com [IPv6:2a00:1450:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E08BC03E979; Sun, 28 Jun 2020 12:53:59 -0700 (PDT) Received: by mail-ej1-x643.google.com with SMTP id w6so14532467ejq.6; Sun, 28 Jun 2020 12:53:58 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=iZR0CLUeN8paQkiNldz9uiOSLfW0tnjjbz4UVcCADzk=; b=ToEHJ4P779R3as4H8AN4Wawahh+8LXXwG4HKHeDHV1c49P+KFrJ1bwgDXNjy133HGY +rwLKej7PyOUXnZDd7kYjy6bw7O3RYp1Hpo4YITt/KoLZXX5ANqEJ9g78tuBO3wPksWZ xvoWFN9+/xbeqEOtLAVvxe8xMVLmYNXnGONnK32swszHyHLVkw5ARwmLtLpcTG3tJ8kJ UfK1mXMjZUxdnfRnNHZunV3/QM30gl8nCv0kQA1qeGjmP91STJ9LcXZIXUqE4WrTyeBk C3eEg3zxMVNcTAg9U+0oAquZLtWBO3NSU/jdmfLATl5LmSzDVy6diTJMAm37ZPuiDJqh Qu7w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=iZR0CLUeN8paQkiNldz9uiOSLfW0tnjjbz4UVcCADzk=; b=SBWSIH6Dwqu7VrGe+o5+7/Ja9IMz78T9l7t6D/ch98VCGc4pGcfaa68m/MSvMnT5jY Ng331j3sRjZlA2CEitVCfeNZcY2rhq2JOiaw9slHfUpKPP9wbXiOx9NGgflWdsVII/ha R78UhJ6k1onikvWoRZk5ub+8ZJfnVz7peWHvLRYb3N8VjRSM0gjXbLGiRyUIsWIwIvj/ qj3P0hv8U3PKPo1tJQOBeMYLRBDSZGTy/50ujo0NbXQdw2ICEfZNw2gJQbqafj+3EWX3 0nxeh4L0OnzOdg2BMJvSprcrDGeLISPq0zeQ1prnCJrNA3GFOihR5BIBLy0v1u5bDpNq J6Qw== X-Gm-Message-State: AOAM532fiDjlCcqJIQ0iUo+PbocuL73/A41azbE+UDAuizM9gs5q/2o8 K1vtO7LHBRNgqaem7cOoC5GLivyq X-Google-Smtp-Source: ABdhPJxpSRlCDWbL3AZhB0RUJyt8jD1tL5ru5iFy5rhG4IONxBHio2q7Q+X3Ig0aX7Tcmz1JFukjMQ== X-Received: by 2002:a17:906:9147:: with SMTP id y7mr10419402ejw.399.1593374037855; Sun, 28 Jun 2020 12:53:57 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:b7f9:7600:f145:9a83:6418:5a5c]) by smtp.gmail.com with ESMTPSA id z8sm15669531eju.106.2020.06.28.12.53.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:53:57 -0700 (PDT) From: Luc Van Oostenryck To: "David S . Miller" Cc: Jakub Kicinski , netdev@vger.kernel.org, oss-drivers@netronome.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Luc Van Oostenryck Subject: [PATCH 13/15] net/hsr: fix hsr_dev_xmit()'s return type Date: Sun, 28 Jun 2020 21:53:35 +0200 Message-Id: <20200628195337.75889-14-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200628195337.75889-1-luc.vanoostenryck@gmail.com> References: <20200628195337.75889-1-luc.vanoostenryck@gmail.com> MIME-Version: 1.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 --- net/hsr/hsr_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index cd99f548e440..7be85e024236 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -210,7 +210,7 @@ static netdev_features_t hsr_fix_features(struct net_device *dev, return hsr_features_recompute(hsr, features); } -static int hsr_dev_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t hsr_dev_xmit(struct sk_buff *skb, struct net_device *dev) { struct hsr_priv *hsr = netdev_priv(dev); struct hsr_port *master; From patchwork Sun Jun 28 19:53:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 216957 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3443FC433E3 for ; Sun, 28 Jun 2020 19:54:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 10D7A206F2 for ; Sun, 28 Jun 2020 19:54:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="htM9hGW3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727024AbgF1TyQ (ORCPT ); Sun, 28 Jun 2020 15:54:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726981AbgF1TyD (ORCPT ); Sun, 28 Jun 2020 15:54:03 -0400 Received: from mail-ej1-x644.google.com (mail-ej1-x644.google.com [IPv6:2a00:1450:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B041DC03E979; Sun, 28 Jun 2020 12:54:02 -0700 (PDT) Received: by mail-ej1-x644.google.com with SMTP id dp18so14519539ejc.8; Sun, 28 Jun 2020 12:54:02 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=IecnikxrmKwKRsrCTW9kdHFofcFntdDjZkZFdGb3EQE=; b=htM9hGW3cBrcBx5OGriOoZ2Q7qb2kQCN4jBJM4mOX8cRyj2Fvt1fFBwLpHtarriC4Q FLclMgfMwZb2vt5V0WuH3YNZf6Ac9JxXRbN2DE/pqISuwewWSA4ZzIqpKRWCDgdB4gGJ W41F8SsLnxtkInh1/0RjcMDxWFkPqVi7kXDyZyPl/A6ZXSfaachwpt322k7R6ypgxW8F NdApUcsygtNPKTm66vQo5pInfspM76rA3tsFgggFOgZFVRGGi+17G5SzlUIhhrPGw6Yq F7XV6xpJa1pQWR8ugjJRm1e6Sd9ZbpxskMF/BYcrBJVfrlvMcxXzuWB8FALsLfXktnMB gNew== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=IecnikxrmKwKRsrCTW9kdHFofcFntdDjZkZFdGb3EQE=; b=dM/FUaqe8z77+KXmSWUbh0NdeCl9nCY4YlaA28cJE6BNOnljosJW0hebEFNyLacA6N v4f8n1XwyCTrJk9Qc9O3+nexwlq8attafnCmAlHiJrZUmsy8gtT+DTdFWedcH0MR27br qNfHu185agbY/n2gtbMcC1371z6DlkWBMOOBuJ1gqjhRae7EzU2e8YusfbRpnX4297s0 pcUN1ASBo1ZdMaA9hGxTmnlLssDvy5v4Liqom7s8yanC534zxrIDiwIU8mxHXPForKo0 uAcCBxL4mNqR0hr+f+U8IWGI5qFPq1NzUGxEDQodTz+mYS8uaORjDoeVW/OvjPJOJKBA PI/g== X-Gm-Message-State: AOAM533GIsNOQSeT+TJTq5Ju02NorX3Eq4jmp5TaT02bG40SvvmhPQkj 7qJ3jG3MDNLGJbclfBzW9E0= X-Google-Smtp-Source: ABdhPJwS6a+/f3aFAtr06rNEF0lhYkFRfGEM+tY+SaUPjEqw/nfHIiS2VxdQx+1Az4I0Kf670fZiaw== X-Received: by 2002:a17:906:2e83:: with SMTP id o3mr7653587eji.261.1593374041507; Sun, 28 Jun 2020 12:54:01 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:b7f9:7600:f145:9a83:6418:5a5c]) by smtp.gmail.com with ESMTPSA id z8sm15669531eju.106.2020.06.28.12.54.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:54:01 -0700 (PDT) From: Luc Van Oostenryck To: "David S . Miller" Cc: Jakub Kicinski , netdev@vger.kernel.org, oss-drivers@netronome.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Luc Van Oostenryck Subject: [PATCH 15/15] cxgb4vf: fix t4vf_eth_xmit()'s return type Date: Sun, 28 Jun 2020 21:53:37 +0200 Message-Id: <20200628195337.75889-16-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200628195337.75889-1-luc.vanoostenryck@gmail.com> References: <20200628195337.75889-1-luc.vanoostenryck@gmail.com> MIME-Version: 1.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/chelsio/cxgb4vf/adapter.h | 2 +- drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h index 3782e48dada2..f55105a4112f 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h +++ b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h @@ -562,7 +562,7 @@ int t4vf_sge_alloc_eth_txq(struct adapter *, struct sge_eth_txq *, unsigned int); void t4vf_free_sge_resources(struct adapter *); -int t4vf_eth_xmit(struct sk_buff *, struct net_device *); +netdev_tx_t t4vf_eth_xmit(struct sk_buff *, struct net_device *); int t4vf_ethrx_handler(struct sge_rspq *, const __be64 *, const struct pkt_gl *); diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c index f71c973398ec..46e50e25dbba 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c @@ -1154,7 +1154,7 @@ static inline void txq_advance(struct sge_txq *tq, unsigned int n) * * Add a packet to an SGE Ethernet TX queue. Runs with softirqs disabled. */ -int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev) +netdev_tx_t t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev) { u32 wr_mid; u64 cntrl, *end;