From: Francois Romieu Date: Wed, 16 Aug 2006 12:51:52 +0000 (+0200) Subject: r8169: use NETDEV_TX_{BUSY/OK} X-Git-Tag: v2.6.19-rc1~1263^2~34^2~6 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=188f4af04618b32b8ec7c630a3f18201c81ce70c;p=linux-2.6-omap-h63xx.git r8169: use NETDEV_TX_{BUSY/OK} Signed-off-by: Francois Romieu --- diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index d0bfe4c8950..b07d2eadeae 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -2277,7 +2277,7 @@ static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev) dma_addr_t mapping; u32 status, len; u32 opts1; - int ret = 0; + int ret = NETDEV_TX_OK; if (unlikely(TX_BUFFS_AVAIL(tp) < skb_shinfo(skb)->nr_frags)) { if (netif_msg_drv(tp)) { @@ -2342,7 +2342,7 @@ out: err_stop: netif_stop_queue(dev); - ret = 1; + ret = NETDEV_TX_BUSY; err_update_stats: tp->stats.tx_dropped++; goto out;