[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20180920123306.14772-5-yuehaibing@huawei.com>
Date: Thu, 20 Sep 2018 20:32:48 +0800
From: YueHaibing <yuehaibing@...wei.com>
To: <davem@...emloft.net>, <dmitry.tarnyagin@...kless.no>,
<wg@...ndegger.com>, <mkl@...gutronix.de>,
<michal.simek@...inx.com>, <hsweeten@...ionengravers.com>,
<madalin.bucur@....com>, <pantelis.antoniou@...il.com>,
<claudiu.manoil@....com>, <leoyang.li@....com>,
<linux@...linux.org.uk>, <sammy@...my.net>, <ralf@...ux-mips.org>,
<nico@...xnic.net>, <steve.glendinning@...well.net>,
<f.fainelli@...il.com>, <grygorii.strashko@...com>,
<w-kwok2@...com>, <m-karicheri2@...com>, <t.sailer@...mni.ethz.ch>,
<jreuter@...na.de>, <kys@...rosoft.com>, <haiyangz@...rosoft.com>,
<wei.liu2@...rix.com>, <paul.durrant@...rix.com>,
<arvid.brodin@...en.se>, <pshelar@....org>
CC: <linux-kernel@...r.kernel.org>, <netdev@...r.kernel.org>,
<linux-can@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>,
<linuxppc-dev@...ts.ozlabs.org>, <linux-mips@...ux-mips.org>,
<linux-omap@...r.kernel.org>, <linux-hams@...r.kernel.org>,
<devel@...uxdriverproject.org>, <linux-usb@...r.kernel.org>,
<xen-devel@...ts.xenproject.org>, <dev@...nvswitch.org>,
YueHaibing <yuehaibing@...wei.com>
Subject: [PATCH net-next 04/22] net: cirrus: fix return type of ndo_start_xmit function
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@...wei.com>
---
drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +-
drivers/net/ethernet/cirrus/mac89x0.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c
index e2a7029..13dfdfc 100644
--- a/drivers/net/ethernet/cirrus/ep93xx_eth.c
+++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c
@@ -332,7 +332,7 @@ static int ep93xx_poll(struct napi_struct *napi, int budget)
return rx;
}
-static int ep93xx_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t ep93xx_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct ep93xx_priv *ep = netdev_priv(dev);
struct ep93xx_tdesc *txd;
diff --git a/drivers/net/ethernet/cirrus/mac89x0.c b/drivers/net/ethernet/cirrus/mac89x0.c
index 3f8fe8f..6324e80 100644
--- a/drivers/net/ethernet/cirrus/mac89x0.c
+++ b/drivers/net/ethernet/cirrus/mac89x0.c
@@ -113,7 +113,7 @@ struct net_local {
/* Index to functions, as function prototypes. */
static int net_open(struct net_device *dev);
-static int net_send_packet(struct sk_buff *skb, struct net_device *dev);
+static netdev_tx_t net_send_packet(struct sk_buff *skb, struct net_device *dev);
static irqreturn_t net_interrupt(int irq, void *dev_id);
static void set_multicast_list(struct net_device *dev);
static void net_rx(struct net_device *dev);
@@ -324,7 +324,7 @@ static int mac89x0_device_probe(struct platform_device *pdev)
return 0;
}
-static int
+static netdev_tx_t
net_send_packet(struct sk_buff *skb, struct net_device *dev)
{
struct net_local *lp = netdev_priv(dev);
--
1.8.3.1
Powered by blists - more mailing lists