diff options
| author | Claudiu Beznea <claudiu.beznea@microchip.com> | 2018-08-07 12:25:12 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-07 13:18:49 -0700 |
| commit | d1c38957aaf3defe029f11761f3a4ae4c83ad690 (patch) | |
| tree | 394c91afbd4de3fff37e8fd0d3eb6d1b6806855c /drivers/net/ethernet/cadence | |
| parent | 334b126fc9441a2ceb1e905aa4db5d462d35c0d2 (diff) | |
| download | linux-d1c38957aaf3defe029f11761f3a4ae4c83ad690.tar.gz linux-d1c38957aaf3defe029f11761f3a4ae4c83ad690.tar.bz2 linux-d1c38957aaf3defe029f11761f3a4ae4c83ad690.zip | |
net: macb: use netdev_tx_t return type for ndo_start_xmit functions
Use netdev_tx_t return type for ndo_start_xmit function of macb driver.
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cadence')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index a6c911bb5ce2..bb1d7b8d7dd6 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -1651,7 +1651,7 @@ static inline int macb_clear_csum(struct sk_buff *skb) return 0; } -static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev) { u16 queue_index = skb_get_queue_mapping(skb); struct macb *bp = netdev_priv(dev); @@ -1660,6 +1660,7 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev) unsigned int desc_cnt, nr_frags, frag_size, f; unsigned int hdrlen; bool is_lso, is_udp = 0; + netdev_tx_t ret = NETDEV_TX_OK; is_lso = (skb_shinfo(skb)->gso_size != 0); @@ -1739,7 +1740,7 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev) unlock: spin_unlock_irqrestore(&bp->lock, flags); - return NETDEV_TX_OK; + return ret; } static void macb_init_rx_buffer_size(struct macb *bp, size_t size) @@ -3549,7 +3550,8 @@ static int at91ether_close(struct net_device *dev) } /* Transmit packet */ -static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t at91ether_start_xmit(struct sk_buff *skb, + struct net_device *dev) { struct macb *lp = netdev_priv(dev); |