aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell/mvneta.c
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2018-09-19 18:19:26 +0800
committerDavid S. Miller <davem@davemloft.net>2018-09-19 21:17:58 -0700
commitf03508ce3f9650148262c176e0178413e16c902b (patch)
tree670ab20f7d3faf97fda63c908f1c6ccb982cbc50 /drivers/net/ethernet/marvell/mvneta.c
parentMerge branch 'phylink-ensure-the-carrier-is-off-when-starting-phylink' (diff)
downloadlinux-dev-f03508ce3f9650148262c176e0178413e16c902b.tar.xz
linux-dev-f03508ce3f9650148262c176e0178413e16c902b.zip
net: marvell: 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/marvell/mvneta.c')
-rw-r--r--drivers/net/ethernet/marvell/mvneta.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 89ed1df7b3e7..59ed63102e14 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -2393,7 +2393,7 @@ error:
}
/* Main tx processing */
-static int mvneta_tx(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t mvneta_tx(struct sk_buff *skb, struct net_device *dev)
{
struct mvneta_port *pp = netdev_priv(dev);
u16 txq_id = skb_get_queue_mapping(skb);