From: YueHaibing <yuehaibing@huawei.com>
To: <davem@davemloft.net>, <dmitry.tarnyagin@lockless.no>,
<wg@grandegger.com>, <mkl@pengutronix.de>,
<michal.simek@xilinx.com>, <hsweeten@visionengravers.com>,
<madalin.bucur@nxp.com>, <pantelis.antoniou@gmail.com>,
<claudiu.manoil@nxp.com>, <leoyang.li@nxp.com>,
<linux@armlinux.org.uk>, <sammy@sammy.net>, <ralf@linux-mips.org>,
<nico@fluxnic.net>, <steve.glendinning@shawell.net>,
<f.fainelli@gmail.com>, <grygorii.strashko@ti.com>,
<w-kwok2@ti.com>, <m-karicheri2@ti.com>,
<t.sailer@alumni.ethz.ch>, <jreuter@yaina.de>,
<kys@microsoft.com>, <haiyangz@microsoft.com>,
<wei.liu2@citrix.com>, <paul.durrant@citrix.com>,
<arvid.brodin@alten.se>, <pshelar@ovn.org>
Cc: <linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>,
<linux-can@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linuxppc-dev@lists.ozlabs.org>, <linux-mips@linux-mips.org>,
<linux-omap@vger.kernel.org>, <linux-hams@vger.kernel.org>,
<devel@linuxdriverproject.org>, <linux-usb@vger.kernel.org>,
<xen-devel@lists.xenproject.org>, <dev@openvswitch.org>,
YueHaibing <yuehaibing@huawei.com>
Subject: [PATCH net-next 08/22] net: apple: fix return type of ndo_start_xmit function
Date: Thu, 20 Sep 2018 20:32:52 +0800 [thread overview]
Message-ID: <20180920123306.14772-9-yuehaibing@huawei.com> (raw)
In-Reply-To: <20180920123306.14772-1-yuehaibing@huawei.com>
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
which is a typedef for an enum type, so make sure the implementation in
this driver has returns 'netdev_tx_t' value, and change the function
return type to netdev_tx_t.
Found by coccinelle.
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
drivers/net/ethernet/apple/bmac.c | 4 ++--
drivers/net/ethernet/apple/mace.c | 4 ++--
drivers/net/ethernet/apple/macmace.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c
index 024998d..6a8e256 100644
--- a/drivers/net/ethernet/apple/bmac.c
+++ b/drivers/net/ethernet/apple/bmac.c
@@ -154,7 +154,7 @@ struct bmac_data {
static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id);
static void bmac_set_timeout(struct net_device *dev);
static void bmac_tx_timeout(struct timer_list *t);
-static int bmac_output(struct sk_buff *skb, struct net_device *dev);
+static netdev_tx_t bmac_output(struct sk_buff *skb, struct net_device *dev);
static void bmac_start(struct net_device *dev);
#define DBDMA_SET(x) ( ((x) | (x) << 16) )
@@ -1456,7 +1456,7 @@ static int bmac_close(struct net_device *dev)
spin_unlock_irqrestore(&bp->lock, flags);
}
-static int
+static netdev_tx_t
bmac_output(struct sk_buff *skb, struct net_device *dev)
{
struct bmac_data *bp = netdev_priv(dev);
diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c
index 0b5429d..68b9ee4 100644
--- a/drivers/net/ethernet/apple/mace.c
+++ b/drivers/net/ethernet/apple/mace.c
@@ -78,7 +78,7 @@ struct mace_data {
static int mace_open(struct net_device *dev);
static int mace_close(struct net_device *dev);
-static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev);
+static netdev_tx_t mace_xmit_start(struct sk_buff *skb, struct net_device *dev);
static void mace_set_multicast(struct net_device *dev);
static void mace_reset(struct net_device *dev);
static int mace_set_address(struct net_device *dev, void *addr);
@@ -525,7 +525,7 @@ static inline void mace_set_timeout(struct net_device *dev)
mp->timeout_active = 1;
}
-static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t mace_xmit_start(struct sk_buff *skb, struct net_device *dev)
{
struct mace_data *mp = netdev_priv(dev);
volatile struct dbdma_regs __iomem *td = mp->tx_dma;
diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c
index 137cbb4..376f2c2 100644
--- a/drivers/net/ethernet/apple/macmace.c
+++ b/drivers/net/ethernet/apple/macmace.c
@@ -89,7 +89,7 @@ struct mace_frame {
static int mace_open(struct net_device *dev);
static int mace_close(struct net_device *dev);
-static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev);
+static netdev_tx_t mace_xmit_start(struct sk_buff *skb, struct net_device *dev);
static void mace_set_multicast(struct net_device *dev);
static int mace_set_address(struct net_device *dev, void *addr);
static void mace_reset(struct net_device *dev);
@@ -444,7 +444,7 @@ static int mace_close(struct net_device *dev)
* Transmit a frame
*/
-static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t mace_xmit_start(struct sk_buff *skb, struct net_device *dev)
{
struct mace_data *mp = netdev_priv(dev);
unsigned long flags;
--
1.8.3.1
next prev parent reply other threads:[~2018-09-20 12:50 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-20 12:32 [PATCH net-next 00/22] net: " YueHaibing
2018-09-20 12:32 ` [PATCH net-next 01/22] net: micrel: " YueHaibing
2018-09-20 12:32 ` [PATCH net-next 02/22] net: freescale: " YueHaibing
2018-09-20 12:32 ` [PATCH net-next 03/22] net: seeq: " YueHaibing
2018-09-20 12:32 ` [PATCH net-next 04/22] net: cirrus: " YueHaibing
2018-09-20 12:32 ` [PATCH net-next 05/22] net: sgi: " YueHaibing
2018-09-20 12:32 ` [PATCH net-next 06/22] net: wiznet: " YueHaibing
2018-09-20 12:32 ` [PATCH net-next 07/22] net: i825xx: " YueHaibing
2018-09-20 12:32 ` YueHaibing [this message]
2018-09-20 12:32 ` [PATCH net-next 09/22] net: smsc: " YueHaibing
2018-09-20 12:32 ` [PATCH net-next 10/22] net: ti: " YueHaibing
2018-09-20 12:32 ` [PATCH net-next 11/22] net: faraday: " YueHaibing
2018-09-20 12:32 ` [PATCH net-next 12/22] net: ovs: " YueHaibing
2018-09-20 12:32 ` [PATCH net-next 13/22] net: xen-netback: " YueHaibing
2018-09-20 14:05 ` Wei Liu
2018-09-20 12:32 ` [PATCH net-next 14/22] net: caif: " YueHaibing
2018-09-20 12:32 ` [PATCH net-next 15/22] net: hamradio: " YueHaibing
2018-09-20 12:33 ` [PATCH net-next 16/22] usbnet: ipheth: " YueHaibing
2018-09-20 12:33 ` [PATCH net-next 17/22] hv_netvsc: " YueHaibing
2018-09-20 14:40 ` Haiyang Zhang
2018-09-20 14:43 ` Stephen Hemminger
2018-09-21 1:37 ` YueHaibing
2018-09-20 12:33 ` [PATCH net-next 18/22] can: xilinx: " YueHaibing
2018-09-20 12:33 ` [PATCH net-next 19/22] net: plip: " YueHaibing
2018-09-20 12:33 ` [PATCH net-next 20/22] rionet: " YueHaibing
2018-09-20 12:33 ` [PATCH net-next 21/22] l2tp: " YueHaibing
2018-09-20 12:33 ` [PATCH net-next 22/22] net: hsr: " YueHaibing
2018-09-20 15:50 ` [PATCH net-next 00/22] net: " David Miller
2018-09-21 1:33 ` YueHaibing
2018-09-20 17:04 ` Grygorii Strashko
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=20180920123306.14772-9-yuehaibing@huawei.com \
--to=yuehaibing@huawei.com \
--cc=arvid.brodin@alten.se \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=dev@openvswitch.org \
--cc=devel@linuxdriverproject.org \
--cc=dmitry.tarnyagin@lockless.no \
--cc=f.fainelli@gmail.com \
--cc=grygorii.strashko@ti.com \
--cc=haiyangz@microsoft.com \
--cc=hsweeten@visionengravers.com \
--cc=jreuter@yaina.de \
--cc=kys@microsoft.com \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-hams@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=m-karicheri2@ti.com \
--cc=madalin.bucur@nxp.com \
--cc=michal.simek@xilinx.com \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=nico@fluxnic.net \
--cc=pantelis.antoniou@gmail.com \
--cc=paul.durrant@citrix.com \
--cc=pshelar@ovn.org \
--cc=ralf@linux-mips.org \
--cc=sammy@sammy.net \
--cc=steve.glendinning@shawell.net \
--cc=t.sailer@alumni.ethz.ch \
--cc=w-kwok2@ti.com \
--cc=wei.liu2@citrix.com \
--cc=wg@grandegger.com \
--cc=xen-devel@lists.xenproject.org \
/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®