Skip to content

Commit 06983aa

Browse files
YueHaibingdavem330
authored andcommitted
net: freescale: fix return type of ndo_start_xmit function
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 2b49117 commit 06983aa

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2044,7 +2044,8 @@ static inline int dpaa_xmit(struct dpaa_priv *priv,
20442044
return 0;
20452045
}
20462046

2047-
static int dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
2047+
static netdev_tx_t
2048+
dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
20482049
{
20492050
const int queue_mapping = skb_get_queue_mapping(skb);
20502051
bool nonlinear = skb_is_nonlinear(skb);

drivers/net/ethernet/freescale/fec_mpc52xx.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,8 @@ static int mpc52xx_fec_close(struct net_device *dev)
305305
* invariant will hold if you make sure that the netif_*_queue()
306306
* calls are done at the proper times.
307307
*/
308-
static int mpc52xx_fec_start_xmit(struct sk_buff *skb, struct net_device *dev)
308+
static netdev_tx_t
309+
mpc52xx_fec_start_xmit(struct sk_buff *skb, struct net_device *dev)
309310
{
310311
struct mpc52xx_fec_priv *priv = netdev_priv(dev);
311312
struct bcom_fec_bd *bd;

drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,8 @@ static struct sk_buff *tx_skb_align_workaround(struct net_device *dev,
481481
}
482482
#endif
483483

484-
static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
484+
static netdev_tx_t
485+
fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
485486
{
486487
struct fs_enet_private *fep = netdev_priv(dev);
487488
cbd_t __iomem *bdp;

drivers/net/ethernet/freescale/gianfar.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
const char gfar_driver_version[] = "2.0";
111111

112112
static int gfar_enet_open(struct net_device *dev);
113-
static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev);
113+
static netdev_tx_t gfar_start_xmit(struct sk_buff *skb, struct net_device *dev);
114114
static void gfar_reset_task(struct work_struct *work);
115115
static void gfar_timeout(struct net_device *dev);
116116
static int gfar_close(struct net_device *dev);
@@ -2332,7 +2332,7 @@ static inline bool gfar_csum_errata_76(struct gfar_private *priv,
23322332
/* This is called by the kernel when a frame is ready for transmission.
23332333
* It is pointed to by the dev->hard_start_xmit function pointer
23342334
*/
2335-
static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
2335+
static netdev_tx_t gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
23362336
{
23372337
struct gfar_private *priv = netdev_priv(dev);
23382338
struct gfar_priv_tx_q *tx_queue = NULL;

drivers/net/ethernet/freescale/ucc_geth.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3078,7 +3078,8 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
30783078

30793079
/* This is called by the kernel when a frame is ready for transmission. */
30803080
/* It is pointed to by the dev->hard_start_xmit function pointer */
3081-
static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
3081+
static netdev_tx_t
3082+
ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
30823083
{
30833084
struct ucc_geth_private *ugeth = netdev_priv(dev);
30843085
#ifdef CONFIG_UGETH_TX_ON_DEMAND

0 commit comments

Comments
 (0)