ChangeSet 1.2199.8.24, 2005/03/22 18:31:52-08:00, [EMAIL PROTECTED]
[NETPOLL]: Handle xmit_lock recursion similarly
Handle possible recursion on xmit_lock while we're at it.
Signed-off-by: Matt Mackall <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
netpoll.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff -Nru a/net/core/netpoll.c b/net/core/netpoll.c
--- a/net/core/netpoll.c 2005-03-26 17:15:20 -08:00
+++ b/net/core/netpoll.c 2005-03-26 17:15:20 -08:00
@@ -247,8 +247,9 @@
return;
}
- /* avoid ->poll recursion */
- if(np->poll_owner == __smp_processor_id()) {
+ /* avoid recursion */
+ if(np->poll_owner == __smp_processor_id() ||
+ np->dev->xmit_lock_owner == __smp_processor_id()) {
if (np->drop)
np->drop(skb);
else
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
