aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/faraday/ftmac100.c
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2018-09-26 17:13:05 +0800
committerDavid S. Miller <davem@davemloft.net>2018-09-26 10:18:08 -0700
commit0a715156656bddf4aa92d9868f850aeeb0465fd0 (patch)
tree2a9cd28e6fc3c61515b3651fe6a2320ea80c1582 /drivers/net/ethernet/faraday/ftmac100.c
parentnet: smsc: fix return type of ndo_start_xmit function (diff)
downloadlinux-dev-0a715156656bddf4aa92d9868f850aeeb0465fd0.tar.xz
linux-dev-0a715156656bddf4aa92d9868f850aeeb0465fd0.zip
net: faraday: 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/faraday/ftmac100.c')
-rw-r--r--drivers/net/ethernet/faraday/ftmac100.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
index a1197d3adbe0..570caeb8ee9e 100644
--- a/drivers/net/ethernet/faraday/ftmac100.c
+++ b/drivers/net/ethernet/faraday/ftmac100.c
@@ -634,8 +634,8 @@ static void ftmac100_tx_complete(struct ftmac100 *priv)
;
}
-static int ftmac100_xmit(struct ftmac100 *priv, struct sk_buff *skb,
- dma_addr_t map)
+static netdev_tx_t ftmac100_xmit(struct ftmac100 *priv, struct sk_buff *skb,
+ dma_addr_t map)
{
struct net_device *netdev = priv->netdev;
struct ftmac100_txdes *txdes;
@@ -1016,7 +1016,8 @@ static int ftmac100_stop(struct net_device *netdev)
return 0;
}
-static int ftmac100_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev)
+static netdev_tx_t
+ftmac100_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev)
{
struct ftmac100 *priv = netdev_priv(netdev);
dma_addr_t map;