Commit d1c38957 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by David S. Miller

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: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 334b126f
...@@ -1651,7 +1651,7 @@ static inline int macb_clear_csum(struct sk_buff *skb) ...@@ -1651,7 +1651,7 @@ static inline int macb_clear_csum(struct sk_buff *skb)
return 0; 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); u16 queue_index = skb_get_queue_mapping(skb);
struct macb *bp = netdev_priv(dev); struct macb *bp = netdev_priv(dev);
...@@ -1660,6 +1660,7 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *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 desc_cnt, nr_frags, frag_size, f;
unsigned int hdrlen; unsigned int hdrlen;
bool is_lso, is_udp = 0; bool is_lso, is_udp = 0;
netdev_tx_t ret = NETDEV_TX_OK;
is_lso = (skb_shinfo(skb)->gso_size != 0); 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) ...@@ -1739,7 +1740,7 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
unlock: unlock:
spin_unlock_irqrestore(&bp->lock, flags); 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) 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) ...@@ -3549,7 +3550,8 @@ static int at91ether_close(struct net_device *dev)
} }
/* Transmit packet */ /* 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); struct macb *lp = netdev_priv(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment