mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-22 16:06:04 -05:00
Code Activity

net: freescale: fix return type of ndo_start_xmit function

Browse source 
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>
This commit is contained in:
YueHaibing 2018-09-21 10:50:32 +08:00 committed by David S. Miller
parent 2b49117a5a
commit 06983aa526
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
View file

@ -2044,7 +2044,8 @@ static inline int dpaa_xmit(struct dpaa_priv *priv,
return 0; 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); const int queue_mapping = skb_get_queue_mapping(skb);
bool nonlinear = skb_is_nonlinear(skb); bool nonlinear = skb_is_nonlinear(skb);

3
drivers/net/ethernet/freescale/fec_mpc52xx.c
View file

@ -305,7 +305,8 @@ static int mpc52xx_fec_close(struct net_device *dev)
* invariant will hold if you make sure that the netif_*_queue() * invariant will hold if you make sure that the netif_*_queue()
* calls are done at the proper times. * 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 mpc52xx_fec_priv *priv = netdev_priv(dev);
struct bcom_fec_bd *bd; struct bcom_fec_bd *bd;

3
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
View file

@ -481,7 +481,8 @@ static struct sk_buff *tx_skb_align_workaround(struct net_device *dev,
} }
#endif #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); struct fs_enet_private *fep = netdev_priv(dev);
cbd_t __iomem *bdp; cbd_t __iomem *bdp;

4
drivers/net/ethernet/freescale/gianfar.c
View file

@ -110,7 +110,7 @@
const char gfar_driver_version[] = "2.0"; const char gfar_driver_version[] = "2.0";
static int gfar_enet_open(struct net_device *dev); 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_reset_task(struct work_struct *work);
static void gfar_timeout(struct net_device *dev); static void gfar_timeout(struct net_device *dev);
static int gfar_close(struct net_device *dev); static int gfar_close(struct net_device *dev);
@ -2332,7 +2332,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. /* 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 * 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_private *priv = netdev_priv(dev);
struct gfar_priv_tx_q *tx_queue = NULL; struct gfar_priv_tx_q *tx_queue = NULL;

3
drivers/net/ethernet/freescale/ucc_geth.c
View file

@ -3078,7 +3078,8 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
/* This is called by the kernel when a frame is ready for transmission. */ /* 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 */ /* 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); struct ucc_geth_private *ugeth = netdev_priv(dev);
#ifdef CONFIG_UGETH_TX_ON_DEMAND #ifdef CONFIG_UGETH_TX_ON_DEMAND