Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81255af8 authored by YueHaibing's avatar YueHaibing Committed by David S. Miller
Browse files

net: xilinx: 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: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bacade82

drivers/net/ethernet/xilinx/ll_temac_main.c

+2 −1
Original line number Diff line number Diff line
@@ -674,7 +674,8 @@ static inline int temac_check_tx_bd_space(struct temac_local *lp, int num_frag) 
	return 0;

}



static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)

static netdev_tx_t

temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)

{

	struct temac_local *lp = netdev_priv(ndev);

	struct cdmac_bd *cur_p;

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

+2 −1
Original line number Diff line number Diff line
@@ -653,7 +653,8 @@ static inline int axienet_check_tx_bd_space(struct axienet_local *lp, 
 * start the transmission. Additionally if checksum offloading is supported,

 * it populates AXI Stream Control fields with appropriate values.

 */

static int axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev)

static netdev_tx_t

axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev)

{

	u32 ii;

	u32 num_frag;

drivers/net/ethernet/xilinx/xilinx_emaclite.c

+5 −4
Original line number Diff line number Diff line
@@ -1019,9 +1019,10 @@ static int xemaclite_close(struct net_device *dev) 
 * deferred and the Tx queue is stopped so that the deferred socket buffer can

 * be transmitted when the Emaclite device is free to transmit data.

 *

 * Return:	0, always.

 * Return:	NETDEV_TX_OK, always.

 */

static int xemaclite_send(struct sk_buff *orig_skb, struct net_device *dev)

static netdev_tx_t

xemaclite_send(struct sk_buff *orig_skb, struct net_device *dev)

{

	struct net_local *lp = netdev_priv(dev);

	struct sk_buff *new_skb;
@@ -1043,7 +1044,7 @@ static int xemaclite_send(struct sk_buff *orig_skb, struct net_device *dev) 
		/* Take the time stamp now, since we can't do this in an ISR. */

		skb_tx_timestamp(new_skb);

		spin_unlock_irqrestore(&lp->reset_lock, flags);

		return 0;

		return NETDEV_TX_OK;

	}

	spin_unlock_irqrestore(&lp->reset_lock, flags);
@@ -1052,7 +1053,7 @@ static int xemaclite_send(struct sk_buff *orig_skb, struct net_device *dev) 
	dev->stats.tx_bytes += len;

	dev_consume_skb_any(new_skb);



	return 0;

	return NETDEV_TX_OK;

}



/**