From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
To: "David S . Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>,
netdev@vger.kernel.org, oss-drivers@netronome.com,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Subject: [PATCH 03/15] caif: fix cfspi_xmit()'s return type
Date: Sun, 28 Jun 2020 21:53:25 +0200 [thread overview]
Message-ID: <20200628195337.75889-4-luc.vanoostenryck@gmail.com> (raw)
In-Reply-To: <20200628195337.75889-1-luc.vanoostenryck@gmail.com>
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 <luc.vanoostenryck@gmail.com>
---
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)
--
2.27.0
next prev parent reply other threads:[~2020-06-28 19:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-28 19:53 [PATCH 00/15] always use netdev_tx_t for xmit()'s return type Luc Van Oostenryck
2020-06-28 19:53 ` [PATCH 01/15] cail,hsi: fix cfhsi_xmit()'s " Luc Van Oostenryck
2020-06-28 19:53 ` [PATCH 02/15] caif: fix caif_xmit()'s " Luc Van Oostenryck
2020-06-28 19:53 ` Luc Van Oostenryck [this message]
2020-06-28 19:53 ` [PATCH 04/15] caif: fix cfv_netdev_tx()'s " Luc Van Oostenryck
2020-06-28 19:53 ` [PATCH 05/15] net: aquantia: fix aq_ndev_start_xmit()'s " Luc Van Oostenryck
2020-06-28 19:53 ` [PATCH 06/15] net: arc_emac: fix arc_emac_tx()'s " Luc Van Oostenryck
2020-06-28 19:53 ` [PATCH 07/15] net: nb8800: fix nb8800_xmit()'s " Luc Van Oostenryck
2020-06-28 19:53 ` [PATCH 08/15] net: nfp: fix nfp_net_tx()'s " Luc Van Oostenryck
2020-06-28 19:53 ` [PATCH 09/15] net: pch_gbe: fix pch_gbe_xmit_frame()'s " Luc Van Oostenryck
2020-06-28 19:53 ` [PATCH 10/15] net: dwc-xlgmac: fix xlgmac_xmit()'s " Luc Van Oostenryck
2020-06-28 19:53 ` [PATCH 11/15] net: plip: fix plip_tx_packet()'s " Luc Van Oostenryck
2020-06-28 19:53 ` [PATCH 12/15] usbnet: ipheth: fix ipheth_tx()'s " Luc Van Oostenryck
2020-06-28 19:53 ` [PATCH 13/15] net/hsr: fix hsr_dev_xmit()'s " Luc Van Oostenryck
2020-06-28 19:53 ` [PATCH 14/15] l2tp: fix l2tp_eth_dev_xmit()'s " Luc Van Oostenryck
2020-06-28 19:53 ` [PATCH 15/15] cxgb4vf: fix t4vf_eth_xmit()'s " Luc Van Oostenryck
2020-06-29 3:53 ` [PATCH 00/15] always use netdev_tx_t for xmit()'s " David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200628195337.75889-4-luc.vanoostenryck@gmail.com \
--to=luc.vanoostenryck@gmail.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).