lkml.org 
[lkml]   [2005]   [Jun]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 2.4.31] e1000: unlock tx_lock before return
Hi all.

Sorry for replying to my own post. I rediffed the patch to make it a -p1
patch as described by DaveM in another (netdev) thread. Also CC'd lkml.

lkml'ers, please CC replies to me, since I'm not subscribed.

Michael Renzmann wrote:
> It may happen that the e1000 driver returns from e1000_xmit_frame()
> while still holding the tx_lock spinlock. This is at least true for the
> version that comes with kernel 2.4.31. The problem doesn't exist in
> 2.6.11.12.
>
> The attached patch applies to vanilla 2.4.31. I couldn't test the patch
> myself (no e1000 available), but it's a trivial patch and thus it's
> expected to work without problems.
>
> Signed-off-by: Michael Renzmann <mrenzmann@otaku42.de>
--- a/drivers/net/e1000/e1000_main.c 2005-04-04 03:42:19.000000000 +0200
+++ b/drivers/net/e1000/e1000_main.c 2005-06-13 21:39:58.000000000 +0200
@@ -1955,8 +1955,8 @@
if(unlikely(e1000_82547_fifo_workaround(adapter, skb))) {
netif_stop_queue(netdev);
mod_timer(&adapter->tx_fifo_stall_timer, jiffies);
- return 1;
spin_unlock_irqrestore(&adapter->tx_lock, flags);
+ return 1;
}
}
\
 
 \ /
  Last update: 2005-06-14 08:55    [W:0.025 / U:0.284 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site