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

From: Matt Mackall <[email-masked]>
Date: Thu, 17 Feb 2005 23:25:19 -0600

Handle possible recursion on xmit_lock while we're at it.

Signed-off-by: Matt Mackall <[email-masked]>

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