| From 793236ab4714b638edf4d93a98a0f3740c705c44 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 26 Sep 2018 17:13:05 +0800 |
| Subject: net: faraday: fix return type of ndo_start_xmit function |
| |
| From: YueHaibing <yuehaibing@huawei.com> |
| |
| [ Upstream commit 0a715156656bddf4aa92d9868f850aeeb0465fd0 ] |
| |
| 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/faraday/ftgmac100.c | 4 ++-- |
| drivers/net/ethernet/faraday/ftmac100.c | 7 ++++--- |
| 2 files changed, 6 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c |
| index f6ed889bc36a2..e4fc38cbe8535 100644 |
| --- a/drivers/net/ethernet/faraday/ftgmac100.c |
| +++ b/drivers/net/ethernet/faraday/ftgmac100.c |
| @@ -712,8 +712,8 @@ static bool ftgmac100_prep_tx_csum(struct sk_buff *skb, u32 *csum_vlan) |
| return skb_checksum_help(skb) == 0; |
| } |
| |
| -static int ftgmac100_hard_start_xmit(struct sk_buff *skb, |
| - struct net_device *netdev) |
| +static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, |
| + struct net_device *netdev) |
| { |
| struct ftgmac100 *priv = netdev_priv(netdev); |
| struct ftgmac100_txdes *txdes, *first; |
| diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c |
| index 9015bd911bee9..084f24daf2b5a 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; |
| @@ -1015,7 +1015,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; |
| -- |
| 2.20.1 |
| |