On Sun, Jan 30, 2011 at 11:21:39AM +0000, Peter Avalos (via DragonFly issue 
tracker) wrote:
> 
> Peter Avalos <[email protected]> added the comment:
> 
> The attached patch causes a panic on boot:
> panic: assertion: !IS_SERIALIZED((s)) in lwkt_serialize_enter
> 
> Dump available here:
> http://www.theshell.com/~pavalos/crash/crash10.tar.xz

Please try this patch as well.  This should be applied after applying
the original patch.

Thanks,
Joe
>From fe7607037cbe9645bf644e2b3dfdb8b5eb0fbd09 Mon Sep 17 00:00:00 2001
From: Joe Talbott <[email protected]>
Date: Mon, 31 Jan 2011 11:04:04 -0500
Subject: [PATCH 59/59] iwn - Fix a couple of missed serializer misuses.

Reported-By: Studbolt via (IRC)
---
 sys/dev/netif/iwn/if_iwn.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/dev/netif/iwn/if_iwn.c b/sys/dev/netif/iwn/if_iwn.c
index 8615536..6167815 100644
--- a/sys/dev/netif/iwn/if_iwn.c
+++ b/sys/dev/netif/iwn/if_iwn.c
@@ -3359,7 +3359,9 @@ iwn_start(struct ifnet *ifp)
 
 	sc = ifp->if_softc;
 
+	wlan_serialize_enter();
 	iwn_start_locked(ifp);
+	wlan_serialize_exit();
 }
 
 static void
@@ -6405,7 +6407,7 @@ iwn_pci_shutdown(device_t dev)
 	struct iwn_softc *sc = device_get_softc(dev);
 
 	wlan_serialize_enter();
-	iwn_stop(sc);
+	iwn_stop_locked(sc);
 	wlan_serialize_exit();
 
 	return 0;
@@ -6448,7 +6450,7 @@ iwn_pci_resume(device_t dev)
 		if (vap != NULL)
 			ieee80211_init(vap);
 		if (ifp->if_flags & IFF_RUNNING)
-			iwn_start(ifp);
+			iwn_start_locked(ifp);
 	}
 	wlan_serialize_exit();
 
-- 
1.7.0.7

Reply via email to