From 16a5327c5c4d2c0375f1b372e928901f1901f928 Mon Sep 17 00:00:00 2001 From: Krishna Kumar Date: Fri, 21 Sep 2007 09:41:15 -0700 Subject: [PATCH] --- yaml --- r: 66837 b: refs/heads/master c: 7b5dfe1aa9faf9fab10960e027a7b1c932580f76 h: refs/heads/master i: 66835: c5f31768d72b55b645b6e5305c645f0159e16803 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8bf591d57032..347b0b00da6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a1f8104c4a477feaf8b4405429119276341a27e +refs/heads/master: 7b5dfe1aa9faf9fab10960e027a7b1c932580f76 diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index 885d9467f40d..4a21d7df1743 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/drivers/net/e1000e/netdev.c @@ -3531,7 +3531,7 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) /* handle pci_map_single() error in e1000_tx_map */ dev_kfree_skb_any(skb); spin_unlock_irqrestore(&adapter->tx_queue_lock, irq_flags); - return NETDEV_TX_BUSY; + return NETDEV_TX_OK; } e1000_tx_queue(adapter, tx_flags, count);