Skip to content

Commit 92b6abb

Browse files
committed
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>
1 parent a37d942 commit 92b6abb

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

drivers/net/ethernet/cadence/macb_main.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1651,7 +1651,7 @@ static inline int macb_clear_csum(struct sk_buff *skb)
16511651
return 0;
16521652
}
16531653

1654-
static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
1654+
static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
16551655
{
16561656
u16 queue_index = skb_get_queue_mapping(skb);
16571657
struct macb *bp = netdev_priv(dev);
@@ -1660,6 +1660,7 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
16601660
unsigned int desc_cnt, nr_frags, frag_size, f;
16611661
unsigned int hdrlen;
16621662
bool is_lso, is_udp = 0;
1663+
netdev_tx_t ret = NETDEV_TX_OK;
16631664

16641665
is_lso = (skb_shinfo(skb)->gso_size != 0);
16651666

@@ -1739,7 +1740,7 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
17391740
unlock:
17401741
spin_unlock_irqrestore(&bp->lock, flags);
17411742

1742-
return NETDEV_TX_OK;
1743+
return ret;
17431744
}
17441745

17451746
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)
35493550
}
35503551

35513552
/* Transmit packet */
3552-
static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev)
3553+
static netdev_tx_t at91ether_start_xmit(struct sk_buff *skb,
3554+
struct net_device *dev)
35533555
{
35543556
struct macb *lp = netdev_priv(dev);
35553557

0 commit comments

Comments
 (0)