| From f31599f0951eb19e06fc5254e646d94bb67e8bd6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 19 Sep 2018 18:19:26 +0800 |
| Subject: net: marvell: fix return type of ndo_start_xmit function |
| |
| From: YueHaibing <yuehaibing@huawei.com> |
| |
| [ Upstream commit f03508ce3f9650148262c176e0178413e16c902b ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/marvell/mvneta.c | 2 +- |
| drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- |
| drivers/net/ethernet/marvell/pxa168_eth.c | 3 ++- |
| 3 files changed, 4 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c |
| index 28762314353f9..4313bbb2396f4 100644 |
| --- a/drivers/net/ethernet/marvell/mvneta.c |
| +++ b/drivers/net/ethernet/marvell/mvneta.c |
| @@ -2394,7 +2394,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); |
| diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c |
| index 29f1260535325..1cc0e8fda4d5e 100644 |
| --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c |
| +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c |
| @@ -2901,7 +2901,7 @@ release: |
| } |
| |
| /* Main tx processing */ |
| -static int mvpp2_tx(struct sk_buff *skb, struct net_device *dev) |
| +static netdev_tx_t mvpp2_tx(struct sk_buff *skb, struct net_device *dev) |
| { |
| struct mvpp2_port *port = netdev_priv(dev); |
| struct mvpp2_tx_queue *txq, *aggr_txq; |
| diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c |
| index 3a9730612a704..ff2fea0f8b751 100644 |
| --- a/drivers/net/ethernet/marvell/pxa168_eth.c |
| +++ b/drivers/net/ethernet/marvell/pxa168_eth.c |
| @@ -1260,7 +1260,8 @@ static int pxa168_rx_poll(struct napi_struct *napi, int budget) |
| return work_done; |
| } |
| |
| -static int pxa168_eth_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| +static netdev_tx_t |
| +pxa168_eth_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| { |
| struct pxa168_eth_private *pep = netdev_priv(dev); |
| struct net_device_stats *stats = &dev->stats; |
| -- |
| 2.20.1 |
| |