aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/apple/bmac.c
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2018-09-21 11:46:37 +0800
committerDavid S. Miller <davem@davemloft.net>2018-09-21 19:15:15 -0700
commite6ce3822a9f264b3f24c1acdc624131fb014f2f0 (patch)
tree53b0ea7fde6f99ee72ea409b16167bca1a67e219 /drivers/net/ethernet/apple/bmac.c
parentnet: i825xx: fix return type of ndo_start_xmit function (diff)
downloadlinux-dev-e6ce3822a9f264b3f24c1acdc624131fb014f2f0.tar.xz
linux-dev-e6ce3822a9f264b3f24c1acdc624131fb014f2f0.zip
net: apple: 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@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/apple/bmac.c')
-rw-r--r--drivers/net/ethernet/apple/bmac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c
index 024998d6d8c6..6a8e2567f2bd 100644
--- a/drivers/net/ethernet/apple/bmac.c
+++ b/drivers/net/ethernet/apple/bmac.c
@@ -154,7 +154,7 @@ static irqreturn_t bmac_txdma_intr(int irq, void *dev_id);
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 @@ bmac_start(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);