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: 11630307 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D0CEE92A for ; Sun, 28 Jun 2020 19:53:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B7AEB206F2 for ; Sun, 28 Jun 2020 19:53:47 +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 S1726810AbgF1Txq (ORCPT ); Sun, 28 Jun 2020 15:53:46 -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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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:24 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: 11630337 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 06E5292A for ; Sun, 28 Jun 2020 19:55:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E363C206F2 for ; Sun, 28 Jun 2020 19:55:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="N26PmMbX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727109AbgF1TzY (ORCPT ); Sun, 28 Jun 2020 15:55:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726805AbgF1Txq (ORCPT ); Sun, 28 Jun 2020 15:53:46 -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 AC4B3C03E97A; Sun, 28 Jun 2020 12:53:45 -0700 (PDT) Received: by mail-ej1-x644.google.com with SMTP id w16so14530560ejj.5; Sun, 28 Jun 2020 12:53:45 -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=fPjGvKjCW6dK/yqgmCOTvyeAHLhCf44/++vEZ5RXXKU=; b=N26PmMbXjO9VvHE1IPZi79DwLxnuHcB5r05bGLEldj5dLdZ8/+uUMXW5UJlY8EKCeo ZMmXjyquOspJC5T1GH/7rnVhpHQ6BUzZsgrbjYosAtC09AAaxsisBWvGeYEznNR4rxYa AF8F3IQaWucFKA7lsaczsbG6x+rXkXhYP9TFa26Q43ZuAX5IzMydqEA1GZAmYF7KBDRo IHQbpFOMygcwpxirsSnfQw3+MBVWkXuOHAHo5B61fBkTb7K0aAVWeVZi9Stqc2jExS/y iVrjDtrsc92VYFzBHquc+V5nRs12CRdpNYo+XwNknWk5Lounx4XtwVxRYrNOlGZYFKkY Lziw== 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=fPjGvKjCW6dK/yqgmCOTvyeAHLhCf44/++vEZ5RXXKU=; b=X5jkDFZEEnm0URzOsRvaUrrfhp3WvbQPKUymuXmW8m0HOiD54KJ8DsRYpsL+HMVMtx iGT5Jrxx3aqLfxbuEg5nw1tenfjLVhU65RrJIY06HRYt73IvqHsXYUmpTmkfzNBmbta0 xTjen1WZv7vvumJizW1qrQEVdGzRYKKqyEMMw/j9yndV+wEe/dyWfhCohHPL2LQdPeUZ HLGcwN6XqIwCYetEQCpRxOeF6G0bW6vsGOB1afx7M+QPoD+QCDUsWTieWhcwhRdsjO2P sp8BTJ7y0e9Ptl4BKRxtCy0mDyG8+3E/w45K5OUcdICTVhVAQOcPWTX+b6rPVcbtZcFi Z9Cg== X-Gm-Message-State: AOAM532Jw31Jt9M/h3qgKKSCQorkww1UK3HRXpp3jolc8c/foVTwZMen VLcPty7Cx064AzOtfJWFIfE= X-Google-Smtp-Source: ABdhPJxxTdHTa56fOOFdq5+yu9QGRGlvURcWLD/3ueZenKrbEQKWCdITdgdnRJDxPaSpQH6u5op/Ng== X-Received: by 2002:a17:906:6410:: with SMTP id d16mr11845024ejm.376.1593374024492; Sun, 28 Jun 2020 12:53:44 -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.43 (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 02/15] caif: fix caif_xmit()'s return type Date: Sun, 28 Jun 2020 21:53:24 +0200 Message-Id: <20200628195337.75889-3-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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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/caif/caif_serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c index d737ceb61203..bcc14c5875bf 100644 --- a/drivers/net/caif/caif_serial.c +++ b/drivers/net/caif/caif_serial.c @@ -266,7 +266,7 @@ static int handle_tx(struct ser_device *ser) return tty_wr; } -static int caif_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t caif_xmit(struct sk_buff *skb, struct net_device *dev) { struct ser_device *ser; 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: 11630335 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C278814B7 for ; Sun, 28 Jun 2020 19:55:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A30DD20739 for ; Sun, 28 Jun 2020 19:55:19 +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 S1726863AbgF1Txu (ORCPT ); Sun, 28 Jun 2020 15:53:50 -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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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:26 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: 11630309 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E92C714B7 for ; Sun, 28 Jun 2020 19:53:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CA5A92053B for ; Sun, 28 Jun 2020 19:53:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DiaK0Mfg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726839AbgF1Txt (ORCPT ); Sun, 28 Jun 2020 15:53:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726832AbgF1Txs (ORCPT ); Sun, 28 Jun 2020 15:53:48 -0400 Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD82AC03E97B; Sun, 28 Jun 2020 12:53:47 -0700 (PDT) Received: by mail-ed1-x542.google.com with SMTP id h28so11146510edz.0; Sun, 28 Jun 2020 12:53:47 -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=FkEfzQFYhiTTzIfLmoFDGHIS3u7YcXXOiJy6nfPZIrQ=; b=DiaK0MfgTCNEv/bYJOycIrJnQ+dTB96cNpQZaeWYfRY8pT+Gf1HveHth8+mY9m4R1R WfwI2rgxPnHguKWTKquz2/dneH+2JFPiPyZdiuKAAnDOq2qVfITb0fsfLo66k0rN8OUJ YAgbM5qF8Fgf7cgGAtyv78AxYyM0uWd05rAkQY1xpCiA/fwMmrKduE919u86wwDzTjpa iM3aXKvGiQxUWaL91O4qRkCLljOdbDAO8vLwvlsDa3YgAR/SlcPzvno/PXQqbyRV7aU1 22dDO0tioJ1ekBkyBXFtxNZHnr0CJ0HU1YzoFW8GteP6p4xvOrgdamDa0fQzwJ+edKR2 UY6Q== 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=FkEfzQFYhiTTzIfLmoFDGHIS3u7YcXXOiJy6nfPZIrQ=; b=b7Gshd3dV0IT3PPHAmCwdiU0/Dcb3xCHMWuJ2lWt5EIpkE5ll93sUB/ffPQWZIGHdK 6xnmV9X2qZs/q46HPixZdS2XPJnzKT+mAAi0sJE2pz584UPlB2ngFdUkUc0lubDdTyy4 4tNlYpNGUonYh8epTkewGRqBmtGhNpwgJWLzM+QxUUhkRH8jyftkqgDnGNJ5LeyLLTWW B1n+2Ui4Ebfbgudj4oR3+Phd5B4WHfNyTK1B5BknlFtIE3h96rVREtTzETuesc/Twc/b K3LAi53b7Tb5hvmra/VzAVwHmqiWGXZKdvTRww9EU7i662c3froAHELpEnjHM7h3iml9 P6Ww== X-Gm-Message-State: AOAM530JtKeqLW7q2+LkPSimUenK8paMfo2SKNWUBNIbgzLqmee0YmyW EIA9eXYvFBBXTOrt0o7MR54= X-Google-Smtp-Source: ABdhPJxZj4ytPV4kFX8iHNzZekK2qo1u4+RzIEHApvBb/svqO5yWNRQjCQUOex2z1IXKDwM2BFZdUA== X-Received: by 2002:aa7:c54f:: with SMTP id s15mr14629590edr.175.1593374026518; Sun, 28 Jun 2020 12:53:46 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:53:46 -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 04/15] caif: fix cfv_netdev_tx()'s return type Date: Sun, 28 Jun 2020 21:53:26 +0200 Message-Id: <20200628195337.75889-5-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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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/caif/caif_virtio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/caif/caif_virtio.c b/drivers/net/caif/caif_virtio.c index eb426822ad06..80ea2e913c2b 100644 --- a/drivers/net/caif/caif_virtio.c +++ b/drivers/net/caif/caif_virtio.c @@ -519,7 +519,7 @@ static struct buf_info *cfv_alloc_and_copy_to_shm(struct cfv_info *cfv, } /* Put the CAIF packet on the virtio ring and kick the receiver */ -static int cfv_netdev_tx(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t cfv_netdev_tx(struct sk_buff *skb, struct net_device *netdev) { struct cfv_info *cfv = netdev_priv(netdev); struct buf_info *buf_info; 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: 11630311 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3DF2292A for ; Sun, 28 Jun 2020 19:53:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 262C920739 for ; Sun, 28 Jun 2020 19:53:53 +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 S1726764AbgF1Txv (ORCPT ); Sun, 28 Jun 2020 15:53:51 -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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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: 11630333 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A3FE514B7 for ; Sun, 28 Jun 2020 19:55:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 888EC2073E for ; Sun, 28 Jun 2020 19:55:11 +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 S1727095AbgF1TzK (ORCPT ); Sun, 28 Jun 2020 15:55:10 -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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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:29 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: 11630329 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6959492A for ; Sun, 28 Jun 2020 19:55:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 50C5E20716 for ; Sun, 28 Jun 2020 19:55:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="seGq1gmr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726895AbgF1Ty7 (ORCPT ); Sun, 28 Jun 2020 15:54:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726885AbgF1Txw (ORCPT ); Sun, 28 Jun 2020 15:53:52 -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 CC4C2C03E97A; Sun, 28 Jun 2020 12:53:51 -0700 (PDT) Received: by mail-ej1-x641.google.com with SMTP id n26so572106ejx.0; Sun, 28 Jun 2020 12:53:51 -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=KlpGrzTCtPyJoyfux6M/d6BlwBAgvNAg2N/TTZv9fjk=; b=seGq1gmrt9AzoVsFCmfZ7S5lWRBAl3VS49TDZajFf9B0dJX9NjmRChfUT+z47wqRu3 uIZcCL5uTHaIdi4UgP9neNZc+PXnR/6+hSVP2a+Or/e7JkMkdB02xHQi/13Z03vtKuN3 Q7wiuFvEnRBqsyO+ZLU7dp9XhQZijdC4C3JQMhLhFAm33J00izIz0WwMqUOv1FuRmhL1 p2hwuY3TDyvF/PoUY6E80YLmP25vrBH/zvWrJStTE2T/kinb3f4fwy+uHFBJV1JcXQmT dpK8M3/sXFYlV93xuWpS6imopewlPdWg4QBJ2FqFytW6yj/1/99KorvNK3ZAAOyrJnye 3mYA== 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=KlpGrzTCtPyJoyfux6M/d6BlwBAgvNAg2N/TTZv9fjk=; b=Qk1zHg+H4ACU9xB0Hv3Krc87HcwiLgDihASE9RtZWNQkz0kar37vLvfXLJz6KqCHdZ 575N1pvxH7e4WZeF7igPtcEPh0bbsiN1km0uVk5Gp+NP/2psbizgv9KTwv1dQyijMxvD nDGOcV6/ZKdxbihBDfw0XudQfhyFEH6gunC6ei9Gq4i7y/P/UwQ+c8GTRNz2K6pJldtF X8aURpSV3+4crTO0duzclJMRvHE7iM8BvLqaGBkXw4nyHM96gFB1c7gKMRAbYCcgxF+n wxdHxYO3m3ny2089wf0od93dCMrlGJHFwMCVVFDlCT+tS/+jbQ0REdBGXuOjeGbE17X9 lnWA== X-Gm-Message-State: AOAM533oGbWBigdMY/imbHejnxHp4cz/WLSB+nQ3fBhyxJ3qi1ZuvZJl DW+2uImuM3xxrNQV8Jpo7ps= X-Google-Smtp-Source: ABdhPJwlR//gaLh8JyjwPvM+UdpLSeqvOCq/GYuFnWc7AEJprsGbJx/eZkxD37vOA10zDvGRkImzNQ== X-Received: by 2002:a17:906:7ac9:: with SMTP id k9mr10790029ejo.489.1593374030628; Sun, 28 Jun 2020 12:53:50 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:53:50 -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 07/15] net: nb8800: fix nb8800_xmit()'s return type Date: Sun, 28 Jun 2020 21:53:29 +0200 Message-Id: <20200628195337.75889-8-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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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/aurora/nb8800.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c index bc273e0db7ff..5b20185cbd62 100644 --- a/drivers/net/ethernet/aurora/nb8800.c +++ b/drivers/net/ethernet/aurora/nb8800.c @@ -384,7 +384,7 @@ static void nb8800_tx_dma_start_irq(struct net_device *dev) spin_unlock(&priv->tx_lock); } -static int nb8800_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t nb8800_xmit(struct sk_buff *skb, struct net_device *dev) { struct nb8800_priv *priv = netdev_priv(dev); struct nb8800_tx_desc *txd; From patchwork Sun Jun 28 19:53:30 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: 11630327 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 44A6814B7 for ; Sun, 28 Jun 2020 19:54:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2CEB720716 for ; Sun, 28 Jun 2020 19:54:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="A9erurED" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726796AbgF1Tyw (ORCPT ); Sun, 28 Jun 2020 15:54:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726895AbgF1Txx (ORCPT ); Sun, 28 Jun 2020 15:53:53 -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 C6556C03E979; Sun, 28 Jun 2020 12:53:52 -0700 (PDT) Received: by mail-ej1-x644.google.com with SMTP id a1so14493018ejg.12; Sun, 28 Jun 2020 12:53:52 -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=qtOiIEBPt4SkK7LL8W0wYi5N7Dg5qkNU6840uKUEEm4=; b=A9erurEDtx3Izd4yjqKUT2sBp4YjmOLAX9WD0HsySrEbAcCR2AwWh3WkpY24KszSGN eIgg1wHmHUUkISV7uen/EM4Q2e+qZCIi2yRVM08K5y/EUJJ4Tr+b2aMfybURblT2LypH c+I59zjHnRYCLx+FhX9EQFyZ4dsR+9muLtMvv3OsgH/drf9i5zbSNXkRtPEr4rKYUXY8 y8T8oRqgy/Pm+T80+wPsBNa504Xsj/sUubxcjH+ZNAgvI4aC1njYu0uNiVx/5gSIaDFN gXZK5QMo5eG7G7Ug5IClRYA7PbosJTZxmMx6U7lpNVonhseF8PFZWnqO1l7p1pxNwuQ9 DFsg== 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=qtOiIEBPt4SkK7LL8W0wYi5N7Dg5qkNU6840uKUEEm4=; b=iTlqk25AMXdkP5Fpt81jyfJ1xwKqytK6ysAmjm7eCABTxo3JTgnCxIazBLwzxEMM7l 2cxj+dYRSzI4FVZ+ZjP1F2FpIRmLb8iefszsCGgfBTQG8llxV5fxs2biBXOgkN2Slu9n YU0BJgNzeCxjxtPSlJLqeqO5rrwHBVWmbQBXQFpHUGqm5w1teDOY6nUhLG8fIrqwIm+m UFl78Y5AgXZPlfCcmA+uHmJIyFwitHNvdexbaoT9U37TpJawTEVRubyT5ANh1P4wU+na D7Hb1U2tJuwdNYgEGMbf+9OvMAsQt5g/vdNEhRvnO3ElLDcrbTfMKifBXLw2sJQvqd+X jdhg== X-Gm-Message-State: AOAM532HwzVkIXmk2QkcKkdTxvfHftSlWP5eBv9pbfOM6wTBldtpDMfP XjBVmHbnZMVxHljFoIdWkfc= X-Google-Smtp-Source: ABdhPJx4fdMhx9d4maG/HXB+0DSLpVO6tt8V+9KbfZdFYn7d/6aQBr75kaorsK/y6gPWufzRTlIyyA== X-Received: by 2002:a17:906:90c1:: with SMTP id v1mr11026636ejw.481.1593374031509; Sun, 28 Jun 2020 12:53:51 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:53:51 -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 08/15] net: nfp: fix nfp_net_tx()'s return type Date: Sun, 28 Jun 2020 21:53:30 +0200 Message-Id: <20200628195337.75889-9-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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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/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 0e0cc3d58bdc..83ff18140bfe 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -974,7 +974,7 @@ static int nfp_net_prep_tx_meta(struct sk_buff *skb, u64 tls_handle) * * 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 skb_frag_t *frag; From patchwork Sun Jun 28 19:53:31 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: 11630325 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1045192A for ; Sun, 28 Jun 2020 19:54:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E8AF720716 for ; Sun, 28 Jun 2020 19:54:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jEp23vW6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727063AbgF1Tym (ORCPT ); Sun, 28 Jun 2020 15:54:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726907AbgF1Txy (ORCPT ); Sun, 28 Jun 2020 15:53:54 -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 EFB4BC03E979; Sun, 28 Jun 2020 12:53:53 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id l12so14487870ejn.10; Sun, 28 Jun 2020 12:53: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:in-reply-to:references :mime-version:content-transfer-encoding; bh=9BW29cs15R7y24DB/D3twWfQ+LOvEc1Her+NuICftwA=; b=jEp23vW6KqKRrqBQt/cX+MQTam12WQdL1AQyBuNgvxSEDoWq2Ph1w4MmYxIe6XS4/7 +G5amB/Ru/D/ANYRS82Y8AunF0lkNwKgNNItKGiTaDy1Q0GD//TnAlOzwsQHO+F6sVix eYAZz6y37wjr4RW5NWZJAKyE5Rakuc7c5/U727n48Uy/jT6kWm3tX8k8hYnPn65W5x9t PBDUCras2XJ51sPocXMFT6bKdChBPpTYPU88W76lpYbbJcxRM/H6IqXm2mr3B7cmlKMH 54FHdyWSIR7iBa6IVUAl1XaJQ/EctrbC8j/ZUDINfjJC7KS+PU8ORT5SQnU2tMROec8a owbA== 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=9BW29cs15R7y24DB/D3twWfQ+LOvEc1Her+NuICftwA=; b=DalvYHApuNNv8Qc4e0V6GBQTXpm0X+L4sj0TBObRAwV9RaBNrzC7cvG6nBzpUgoSZX VweMg75fg1Mv2pskeF0lhAvZVXrpwE5tsVWJMYUcKJ8Sg7d+d6FLXeXbQJJo8C/vRETH h/5fKaRsNQlP84zUUL2b2XoxCjChir0cnSqVvRJ8PKxAIBPRlHgPblUCrRk+neTu34I+ g1b3C5nQJ7UXGoirZ+Eif9aXNvetiVaw1WuepW0oTALUe5pyhLjWuBB6dznKYb/Iox9i Aro8qiYWfhcAUdcXOoR15ggsUJ1nI37PZ/AAWlwbKPayTtbuktqWDGT7aPrGRtmBNyhH HD0Q== X-Gm-Message-State: AOAM531GMU1IEQGf+JNxC3HzCeHQWa88SR8KOivGxSW7u9tDvxdo2bB2 WyRT1+mcs94Xsw4yNffgvbU= X-Google-Smtp-Source: ABdhPJxljGTAylajN15yJTYN/mmctJCm+3Mk4kmPFb6iW2GTymn73lHe735BvC/L9+y0wS0ICXjfiA== X-Received: by 2002:a17:906:8417:: with SMTP id n23mr11119322ejx.192.1593374032709; Sun, 28 Jun 2020 12:53:52 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:53:52 -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 09/15] net: pch_gbe: fix pch_gbe_xmit_frame()'s return type Date: Sun, 28 Jun 2020 21:53:31 +0200 Message-Id: <20200628195337.75889-10-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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index 73ec195fbc30..23f7c76737c9 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -2064,7 +2064,7 @@ static int pch_gbe_stop(struct net_device *netdev) * - NETDEV_TX_OK: Normal end * - NETDEV_TX_BUSY: Error end */ -static int pch_gbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t pch_gbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev) { struct pch_gbe_adapter *adapter = netdev_priv(netdev); struct pch_gbe_tx_ring *tx_ring = adapter->tx_ring; From patchwork Sun Jun 28 19:53:32 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: 11630317 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 18DD514B7 for ; Sun, 28 Jun 2020 19:54:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F3B9020738 for ; Sun, 28 Jun 2020 19:54:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ORtQCAXV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726959AbgF1TyB (ORCPT ); Sun, 28 Jun 2020 15:54:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726919AbgF1Txz (ORCPT ); Sun, 28 Jun 2020 15:53:55 -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 E5C56C03E979; Sun, 28 Jun 2020 12:53:54 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id n26so572172ejx.0; Sun, 28 Jun 2020 12:53:54 -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=pAX77xx+Fo5Ilh4w2wWJbjIyfYoFJR13zsAdUDWP5lI=; b=ORtQCAXV5rGZVxdgC4LM/JQWYZQO1MCmsUNk47ky+dXPGagcpzObCeCh75brKbehuI lbolaSqKjyD5y/ihh+aDqvxlvtL7bW4I4P398OMVjhibjTt6jOZbsQF+Zedu1G2wsx7d 6B5iLyawKsB374VRbGMCrGWYNHBF3L8u5+8HA3J1MD3XC5+0OgSD8UBn5w4Gmacr1l38 fpbaRQsC4oc6n/OsxI5GJ+N4i5fWT2NefU+pXHD5rzsCkJNfjX5SuwJ3ijdyHe1CaVd3 uKSra5V9M7U4OR7oBZ0A1w0YYBIAH1xm8XoPVSwzwSjgAKk/EPTmIl8a8FeehQqBqcr3 W3gQ== 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=pAX77xx+Fo5Ilh4w2wWJbjIyfYoFJR13zsAdUDWP5lI=; b=mdKnEgR2Xjf9jTLvi3/8bv2Azqyu9KNCghg3L+GIA3UZ6YNjfN6UGWHi9K5uN1XMST JQMPbBqvTv1BdL7gm7DHS00r5V9qSYsVtAkSpFQ1GE71MGbXJ9A9HFFJz+h63iqrw/9+ Ybzp+vX72pn1sN3EBwN1gOYH9XGk7PLXoOVagGOJ6gUq9rsP3YdbqIBjeV8n9es/sYuV dcfwproJE8hQwW6ncKXzQsk1PCtyCZzaEP3h4bbzzidW/pnfjQBnVWcan64NSjbHr+yM TmHoRJ0fMttZHI1gb7W1VnKvrxaLDMFdMU5hXKG52AO1W7S2WJSvIW7E/qRsKrjH3CiC sV5w== X-Gm-Message-State: AOAM5333ck7bMi7Kwj2zwihJa7QMr+Ip1D8GGxjmHikpqkREa57HVzTM JOT+UdMWAA6wmyBqjAqHRvQ= X-Google-Smtp-Source: ABdhPJzyejn+pNiHCA+LRfTXQ+P4XlARbZ8cDgn8MJz3UieLgYh3RK84aVsGD4qWvoqYGtUhIv4pxQ== X-Received: by 2002:a17:906:a242:: with SMTP id bi2mr6654719ejb.243.1593374033731; Sun, 28 Jun 2020 12:53:53 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:53:53 -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 10/15] net: dwc-xlgmac: fix xlgmac_xmit()'s return type Date: Sun, 28 Jun 2020 21:53:32 +0200 Message-Id: <20200628195337.75889-11-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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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/synopsys/dwc-xlgmac-net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c index 07046a2370b3..26aa7f32151f 100644 --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c @@ -697,7 +697,7 @@ static void xlgmac_tx_timeout(struct net_device *netdev, unsigned int txqueue) schedule_work(&pdata->restart_work); } -static int xlgmac_xmit(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t xlgmac_xmit(struct sk_buff *skb, struct net_device *netdev) { struct xlgmac_pdata *pdata = netdev_priv(netdev); struct xlgmac_pkt_info *tx_pkt_info; 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: 11630319 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7BA9B92A for ; Sun, 28 Jun 2020 19:54:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63DC62078C for ; Sun, 28 Jun 2020 19:54:30 +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 S1726947AbgF1TyA (ORCPT ); Sun, 28 Jun 2020 15:54:00 -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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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:34 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: 11630321 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3259492A for ; Sun, 28 Jun 2020 19:54:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 198F320716 for ; Sun, 28 Jun 2020 19:54:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QlgOiKYm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726936AbgF1Tx7 (ORCPT ); Sun, 28 Jun 2020 15:53:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726834AbgF1Tx5 (ORCPT ); Sun, 28 Jun 2020 15:53:57 -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 1966EC03E97B; Sun, 28 Jun 2020 12:53:57 -0700 (PDT) Received: by mail-ej1-x643.google.com with SMTP id rk21so14544833ejb.2; Sun, 28 Jun 2020 12:53:57 -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=b9kv/WRpFNxhscBQ0mp9gvC658NN3RHBgTIAlVk4Lmo=; b=QlgOiKYmjXAmGMVksdlwj06M102fXqaDHrqcbFl74zJlTv0xwj1vrhjvDDCDfemqft 6mtYiVK5Cy2YLkLDAggsCVYz2TBEjdEY3SdynA3TPdSYDiEKgzl6N+4KvgcSqqnEEX2I 0KVY7m6X7KpY1uyEJYGswOrrQ8N2NkJOhVybIV5Wu9eITZ2V36IjxYuP3qCvDnxvhs72 rLrxYLM0fI2ybFkfLpYv3x5GKiXyhXyAtI652hAsFc8TZZvCFOHmH8UCzkn4fIMJzNri VWhyIpet71q6XZMlp3daV6QbWbIqqDVDqc9kuexHxB5sf9el04dpqWc1bS+EJH6AFihL 4SHg== 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=b9kv/WRpFNxhscBQ0mp9gvC658NN3RHBgTIAlVk4Lmo=; b=IoK+G4MkCupjatW1uV0dStl7CMJLZX18jwZqUXCW8+MmdduoHgZZI5v+HmQSRUoW7Q 8b1s7mSNAgX5Gr76nFx7rxQCo+on71eclQtcIshcmTYPfX6ErURWRWC4i7l0Xe/rgVns EomQhrsEWx4Mb439ENH29IYn+KY2iT2sP1GXmf2tEKX0tKdhmTu3/JRaweLmONGGcpNQ bv/UyVSeETXkpiQ+7/qAbpsAEUWbvMmaZfmp+2lldYcXH0J6/LLlL5UeW9Q1/KGtBzsG lA2aD2Yg+bGNDPXnK+tfsrVPOFBepcOemt6lKhCsQTEZKdkQN3pIyGLeMH79jg9luo3X FiSA== X-Gm-Message-State: AOAM533IcZhuMw6i5s4uKz66tB8l5msfnA66/5LN+elmILuWBfdh1h3z I01NK1tin7tIPmuZtz+tXUY= X-Google-Smtp-Source: ABdhPJwz+/sfJQ25wk8u3i0JEQcC45AjemvN/kuwHpDeY34B7oXVJ0M5WF3iVu1gHiUUWHZPdCMUZg== X-Received: by 2002:a17:906:ce32:: with SMTP id sd18mr11630711ejb.228.1593374035852; Sun, 28 Jun 2020 12:53:55 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:53:55 -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 12/15] usbnet: ipheth: fix ipheth_tx()'s return type Date: Sun, 28 Jun 2020 21:53:34 +0200 Message-Id: <20200628195337.75889-13-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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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/usb/ipheth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c index c792d65dd7b4..b09b45382faf 100644 --- a/drivers/net/usb/ipheth.c +++ b/drivers/net/usb/ipheth.c @@ -358,7 +358,7 @@ static int ipheth_close(struct net_device *net) return 0; } -static int ipheth_tx(struct sk_buff *skb, struct net_device *net) +static netdev_tx_t ipheth_tx(struct sk_buff *skb, struct net_device *net) { struct ipheth_device *dev = netdev_priv(net); struct usb_device *udev = dev->udev; 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: 11630323 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6DCE592A for ; Sun, 28 Jun 2020 19:54:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5674620739 for ; Sun, 28 Jun 2020 19:54:39 +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 S1727046AbgF1Tye (ORCPT ); Sun, 28 Jun 2020 15:54:34 -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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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:36 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: 11630315 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1EAE792A for ; Sun, 28 Jun 2020 19:54:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 02842206F1 for ; Sun, 28 Jun 2020 19:54:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FbhLWOsy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726967AbgF1TyC (ORCPT ); Sun, 28 Jun 2020 15:54:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726953AbgF1TyB (ORCPT ); Sun, 28 Jun 2020 15:54:01 -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 E6B13C03E979; Sun, 28 Jun 2020 12:54:00 -0700 (PDT) Received: by mail-ej1-x644.google.com with SMTP id n26so572289ejx.0; Sun, 28 Jun 2020 12:54:00 -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=y5AwQdwtfID2u/puIgMbLam+xf3huoq1vXnu8WamPow=; b=FbhLWOsy5hN3Yj+XBZf75+l8rvYCOtk92ZDNUrqA9xFV1FBDxfTu8Cvv+VkrAm49na xn+Jz9hNP5JnYntKrVJ+iFF5zpcJHq/LNVcRWaxziTBLuiQ3ieXX7ARMisotVH+yObLq v281Qaq2x1w6xRJdyEteibsLPb4J1TAtn5fwozLdvYeQPnFR/n0qQRkB0xFIaPkELVhT bHpFBvzqUzz2jI0lRjNaHW8wySCE77anb9vjGaFUuy5hGjy73l9/4S1qZeQhcYpAIzZo 8NEonDLWpWCuKHYzzlLBNDNkuLHl1nGiab5XISls0+1NbcTy3hPfUv8BxrRsCll9JaSv 9UbQ== 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=y5AwQdwtfID2u/puIgMbLam+xf3huoq1vXnu8WamPow=; b=Bfd+hDX9aFWnzZ2gtqCFbELE9eCFJcNNOO7rRctE/geu+uXF+27m2bKuhN9AwpG1o3 6/LCdbi+HqBEM8YjYPsSOMSM64WeEkG2WXgkNnMht24AeEqbX2n4Kh6OIgidNcC+xRzw EbT69Kf/yRlAPV9CHtBo5taCnMI12FLpaWwrDzw6F4CQCFTN8atoHG9QOj1KVEXBLPOt 2tvQZrgWurtHu7/4o/OL3Vd+cucaW35/2T/Ag9kRz51hSGMkKQcc+1krBGy+AL51RVlJ Jk0y5GQLfZBB5AzpMaMNtYv83zRa12ErIRCZYlnVjLjReittk52q3MEOPIPNpPv49pR8 YpeA== X-Gm-Message-State: AOAM531cY9nRNEDlqgTcNE+xVndCnM6S6+YG6cNrnfVCn2Iio477xhG5 H78s9bYL4vdVTqS3tL7iUCA= X-Google-Smtp-Source: ABdhPJyzQxjzIga1VRSuK67nFui0CBRkn+mtt7nH66aoALVG79Pk8BsBkLSSXRmmxUQOk6JRL9Eeuw== X-Received: by 2002:a17:906:23e9:: with SMTP id j9mr159779ejg.107.1593374039753; Sun, 28 Jun 2020 12:53:59 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:53:59 -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 14/15] l2tp: fix l2tp_eth_dev_xmit()'s return type Date: Sun, 28 Jun 2020 21:53:36 +0200 Message-Id: <20200628195337.75889-15-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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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/l2tp/l2tp_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c index fd5ac2788e45..3099efa19249 100644 --- a/net/l2tp/l2tp_eth.c +++ b/net/l2tp/l2tp_eth.c @@ -73,7 +73,7 @@ static void l2tp_eth_dev_uninit(struct net_device *dev) */ } -static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev) { struct l2tp_eth *priv = netdev_priv(dev); struct l2tp_session *session = priv->session; 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: 11630313 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF3FB14B7 for ; Sun, 28 Jun 2020 19:54:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9396A20738 for ; Sun, 28 Jun 2020 19:54:21 +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 S1727016AbgF1TyP (ORCPT ); Sun, 28 Jun 2020 15:54:15 -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: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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;