| From 5ebfca403cb81f63ce2efbcc776122ca382bb8de Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 18 Sep 2018 14:09:43 +0800 |
| Subject: net: hns3: fix return type of ndo_start_xmit function |
| |
| From: YueHaibing <yuehaibing@huawei.com> |
| |
| [ Upstream commit c9c3941186c5637caed131c4f4064411d6882299 ] |
| |
| The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', |
| which is a typedef for an enum type, also the implementation in this |
| driver has returns 'netdev_tx_t' value, so just 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/hisilicon/hip04_eth.c | 3 ++- |
| drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- |
| 2 files changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c |
| index 644ad78d00515..e8936ae46add9 100644 |
| --- a/drivers/net/ethernet/hisilicon/hip04_eth.c |
| +++ b/drivers/net/ethernet/hisilicon/hip04_eth.c |
| @@ -424,7 +424,8 @@ static void hip04_start_tx_timer(struct hip04_priv *priv) |
| ns, HRTIMER_MODE_REL); |
| } |
| |
| -static int hip04_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev) |
| +static netdev_tx_t |
| +hip04_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev) |
| { |
| struct hip04_priv *priv = netdev_priv(ndev); |
| struct net_device_stats *stats = &ndev->stats; |
| diff --git a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c |
| index c5727003af8c1..471805ea363b6 100644 |
| --- a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c |
| +++ b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c |
| @@ -736,7 +736,7 @@ static int hix5hd2_fill_sg_desc(struct hix5hd2_priv *priv, |
| return 0; |
| } |
| |
| -static int hix5hd2_net_xmit(struct sk_buff *skb, struct net_device *dev) |
| +static netdev_tx_t hix5hd2_net_xmit(struct sk_buff *skb, struct net_device *dev) |
| { |
| struct hix5hd2_priv *priv = netdev_priv(dev); |
| struct hix5hd2_desc *desc; |
| -- |
| 2.20.1 |
| |