| From 52c11a596d12e62ed691fb0095f415de4b9b5cfa Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 21 Sep 2018 10:50:32 +0800 |
| Subject: net: freescale: fix return type of ndo_start_xmit function |
| |
| From: YueHaibing <yuehaibing@huawei.com> |
| |
| [ Upstream commit 06983aa526c759ebdf43f202d8d0491d9494e2f4 ] |
| |
| 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/freescale/dpaa/dpaa_eth.c | 3 ++- |
| drivers/net/ethernet/freescale/fec_mpc52xx.c | 3 ++- |
| drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 3 ++- |
| drivers/net/ethernet/freescale/gianfar.c | 4 ++-- |
| drivers/net/ethernet/freescale/ucc_geth.c | 3 ++- |
| 5 files changed, 10 insertions(+), 6 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c |
| index d7915cd68dc14..462bb8c4f80c9 100644 |
| --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c |
| +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c |
| @@ -2046,7 +2046,8 @@ static inline int dpaa_xmit(struct dpaa_priv *priv, |
| return 0; |
| } |
| |
| -static int dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev) |
| +static netdev_tx_t |
| +dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev) |
| { |
| const int queue_mapping = skb_get_queue_mapping(skb); |
| bool nonlinear = skb_is_nonlinear(skb); |
| diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c |
| index 6d7269d87a850..b90bab72efdb3 100644 |
| --- a/drivers/net/ethernet/freescale/fec_mpc52xx.c |
| +++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c |
| @@ -305,7 +305,8 @@ static int mpc52xx_fec_close(struct net_device *dev) |
| * invariant will hold if you make sure that the netif_*_queue() |
| * calls are done at the proper times. |
| */ |
| -static int mpc52xx_fec_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| +static netdev_tx_t |
| +mpc52xx_fec_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| { |
| struct mpc52xx_fec_priv *priv = netdev_priv(dev); |
| struct bcom_fec_bd *bd; |
| diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c |
| index 2c2976a2dda6b..7c548ed535da5 100644 |
| --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c |
| +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c |
| @@ -481,7 +481,8 @@ static struct sk_buff *tx_skb_align_workaround(struct net_device *dev, |
| } |
| #endif |
| |
| -static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| +static netdev_tx_t |
| +fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| { |
| struct fs_enet_private *fep = netdev_priv(dev); |
| cbd_t __iomem *bdp; |
| diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c |
| index f27f9bae1a4ac..c97c4edfa31bc 100644 |
| --- a/drivers/net/ethernet/freescale/gianfar.c |
| +++ b/drivers/net/ethernet/freescale/gianfar.c |
| @@ -112,7 +112,7 @@ |
| const char gfar_driver_version[] = "2.0"; |
| |
| static int gfar_enet_open(struct net_device *dev); |
| -static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev); |
| +static netdev_tx_t gfar_start_xmit(struct sk_buff *skb, struct net_device *dev); |
| static void gfar_reset_task(struct work_struct *work); |
| static void gfar_timeout(struct net_device *dev); |
| static int gfar_close(struct net_device *dev); |
| @@ -2334,7 +2334,7 @@ static inline bool gfar_csum_errata_76(struct gfar_private *priv, |
| /* This is called by the kernel when a frame is ready for transmission. |
| * It is pointed to by the dev->hard_start_xmit function pointer |
| */ |
| -static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| +static netdev_tx_t gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| { |
| struct gfar_private *priv = netdev_priv(dev); |
| struct gfar_priv_tx_q *tx_queue = NULL; |
| diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c |
| index 1e2b53a934fb9..a5bf02ae4bc5c 100644 |
| --- a/drivers/net/ethernet/freescale/ucc_geth.c |
| +++ b/drivers/net/ethernet/freescale/ucc_geth.c |
| @@ -3085,7 +3085,8 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) |
| |
| /* This is called by the kernel when a frame is ready for transmission. */ |
| /* It is pointed to by the dev->hard_start_xmit function pointer */ |
| -static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| +static netdev_tx_t |
| +ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| { |
| struct ucc_geth_private *ugeth = netdev_priv(dev); |
| #ifdef CONFIG_UGETH_TX_ON_DEMAND |
| -- |
| 2.20.1 |
| |