| From 73caafd57a2b9ae787fb491a194669abe09ae310 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 21 Sep 2018 10:42:15 +0800 |
| Subject: net: micrel: fix return type of ndo_start_xmit function |
| |
| From: YueHaibing <yuehaibing@huawei.com> |
| |
| [ Upstream commit 2b49117a5abee8478b0470cba46ac74f93b4a479 ] |
| |
| 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/micrel/ks8695net.c | 2 +- |
| drivers/net/ethernet/micrel/ks8851_mll.c | 4 ++-- |
| 2 files changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/micrel/ks8695net.c b/drivers/net/ethernet/micrel/ks8695net.c |
| index bd51e057e9150..b881f5d4a7f9e 100644 |
| --- a/drivers/net/ethernet/micrel/ks8695net.c |
| +++ b/drivers/net/ethernet/micrel/ks8695net.c |
| @@ -1164,7 +1164,7 @@ ks8695_timeout(struct net_device *ndev) |
| * sk_buff and adds it to the TX ring. It then kicks the TX DMA |
| * engine to ensure transmission begins. |
| */ |
| -static int |
| +static netdev_tx_t |
| ks8695_start_xmit(struct sk_buff *skb, struct net_device *ndev) |
| { |
| struct ks8695_priv *ksp = netdev_priv(ndev); |
| diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c |
| index 0e9719fbc6243..35f8c9ef204d9 100644 |
| --- a/drivers/net/ethernet/micrel/ks8851_mll.c |
| +++ b/drivers/net/ethernet/micrel/ks8851_mll.c |
| @@ -1021,9 +1021,9 @@ static void ks_write_qmu(struct ks_net *ks, u8 *pdata, u16 len) |
| * spin_lock_irqsave is required because tx and rx should be mutual exclusive. |
| * So while tx is in-progress, prevent IRQ interrupt from happenning. |
| */ |
| -static int ks_start_xmit(struct sk_buff *skb, struct net_device *netdev) |
| +static netdev_tx_t ks_start_xmit(struct sk_buff *skb, struct net_device *netdev) |
| { |
| - int retv = NETDEV_TX_OK; |
| + netdev_tx_t retv = NETDEV_TX_OK; |
| struct ks_net *ks = netdev_priv(netdev); |
| |
| disable_irq(netdev->irq); |
| -- |
| 2.20.1 |
| |