netdev
[Top] [All Lists]

[PATCH 6/7] netpoll: handle xmit_lock recursion similarly

To: Jeff Garzik <jgarzik@xxxxxxxxx>
Subject: [PATCH 6/7] netpoll: handle xmit_lock recursion similarly
From: Matt Mackall <mpm@xxxxxxxxxxx>
Date: Thu, 03 Mar 2005 14:46:32 -0600
Cc: netdev@xxxxxxxxxxx, Jeff Moyer <jmoyer@xxxxxxxxxx>
In-reply-to: <6.454130102@selenic.com>
Sender: netdev-bounce@xxxxxxxxxxx
Handle possible recursion on xmit_lock while we're at it.

Signed-off-by: Matt Mackall <mpm@xxxxxxxxxxx>

Index: rc4/net/core/netpoll.c
===================================================================
--- rc4.orig/net/core/netpoll.c 2005-02-17 22:40:05.000000000 -0600
+++ rc4/net/core/netpoll.c      2005-02-17 22:40:07.000000000 -0600
@@ -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

<Prev in Thread] Current Thread [Next in Thread>