aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/apple/mace.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/mace.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/mace.c')
-rw-r--r--drivers/net/ethernet/apple/mace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c
index 0b5429d76bcf..68b9ee489489 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;