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 15/15] cxgb4vf: fix t4vf_eth_xmit()'s return type
Date: Sun, 28 Jun 2020 21:53:37 +0200 [thread overview]
Message-ID: <20200628195337.75889-16-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.
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
---
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;
--
2.27.0
next prev parent reply other threads:[~2020-06-28 19:54 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 " 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 ` [PATCH 03/15] caif: fix cfspi_xmit()'s " Luc Van Oostenryck
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 ` Luc Van Oostenryck [this message]
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-16-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
all inboxes | Powered by JetHome®