redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
YueHaibing 2018-09-19 18:32:40 +08:00 committed by David S. Miller
parent bacade8225
commit 81255af8d9
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/xilinx/ll_temac_main.c
View File

@ -674,7 +674,8 @@ static inline int temac_check_tx_bd_space(struct temac_local *lp, int num_frag)
return 0; 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 temac_local *lp = netdev_priv(ndev);
struct cdmac_bd *cur_p; struct cdmac_bd *cur_p;

3
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
View File

@ -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, * start the transmission. Additionally if checksum offloading is supported,
* it populates AXI Stream Control fields with appropriate values. * 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 ii;
u32 num_frag; u32 num_frag;

9
drivers/net/ethernet/xilinx/xilinx_emaclite.c
View File

@ -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 * 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. * 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 net_local *lp = netdev_priv(dev);
struct sk_buff *new_skb; 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. */ /* Take the time stamp now, since we can't do this in an ISR. */
skb_tx_timestamp(new_skb); skb_tx_timestamp(new_skb);
spin_unlock_irqrestore(&lp->reset_lock, flags); spin_unlock_irqrestore(&lp->reset_lock, flags);
return 0; return NETDEV_TX_OK;
} }
spin_unlock_irqrestore(&lp->reset_lock, flags); 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->stats.tx_bytes += len;
dev_consume_skb_any(new_skb); dev_consume_skb_any(new_skb);
return 0; return NETDEV_TX_OK;
} }
/** /**