diff --git a/[refs] b/[refs]
index 8e0d4b576468..6ed390fec02f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcf0bf90cd9e9242b66e0563b6a8c8db2e4c262c
+refs/heads/master: 188f4af04618b32b8ec7c630a3f18201c81ce70c
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index d0bfe4c8950d..b07d2eadeae6 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/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 @@ static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 err_stop:
 	netif_stop_queue(dev);
-	ret = 1;
+	ret = NETDEV_TX_BUSY;
 err_update_stats:
 	tp->stats.tx_dropped++;
 	goto out;