| From 4024715a8505904ac090358e46e12a1337537078 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 19 Sep 2018 18:45:12 +0800 |
| Subject: net: broadcom: fix return type of ndo_start_xmit function |
| |
| From: YueHaibing <yuehaibing@huawei.com> |
| |
| [ Upstream commit 0c13b8d1aee87c35a2fbc1d85a1f766227cf54b5 ] |
| |
| 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/broadcom/bcm63xx_enet.c | 5 +++-- |
| drivers/net/ethernet/broadcom/sb1250-mac.c | 4 ++-- |
| 2 files changed, 5 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c |
| index 897302adc38ec..50f8a377596e1 100644 |
| --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c |
| +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c |
| @@ -568,12 +568,13 @@ static irqreturn_t bcm_enet_isr_dma(int irq, void *dev_id) |
| /* |
| * tx request callback |
| */ |
| -static int bcm_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| +static netdev_tx_t |
| +bcm_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| { |
| struct bcm_enet_priv *priv; |
| struct bcm_enet_desc *desc; |
| u32 len_stat; |
| - int ret; |
| + netdev_tx_t ret; |
| |
| priv = netdev_priv(dev); |
| |
| diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c |
| index ef4a0c326736d..7e3f9642ba6c5 100644 |
| --- a/drivers/net/ethernet/broadcom/sb1250-mac.c |
| +++ b/drivers/net/ethernet/broadcom/sb1250-mac.c |
| @@ -299,7 +299,7 @@ static enum sbmac_state sbmac_set_channel_state(struct sbmac_softc *, |
| static void sbmac_promiscuous_mode(struct sbmac_softc *sc, int onoff); |
| static uint64_t sbmac_addr2reg(unsigned char *ptr); |
| static irqreturn_t sbmac_intr(int irq, void *dev_instance); |
| -static int sbmac_start_tx(struct sk_buff *skb, struct net_device *dev); |
| +static netdev_tx_t sbmac_start_tx(struct sk_buff *skb, struct net_device *dev); |
| static void sbmac_setmulti(struct sbmac_softc *sc); |
| static int sbmac_init(struct platform_device *pldev, long long base); |
| static int sbmac_set_speed(struct sbmac_softc *s, enum sbmac_speed speed); |
| @@ -2028,7 +2028,7 @@ static irqreturn_t sbmac_intr(int irq,void *dev_instance) |
| * Return value: |
| * nothing |
| ********************************************************************* */ |
| -static int sbmac_start_tx(struct sk_buff *skb, struct net_device *dev) |
| +static netdev_tx_t sbmac_start_tx(struct sk_buff *skb, struct net_device *dev) |
| { |
| struct sbmac_softc *sc = netdev_priv(dev); |
| unsigned long flags; |
| -- |
| 2.20.1 |
| |