From c73a317e981ffb8e004b9bcf788aa359b1915d62 Mon Sep 17 00:00:00 2001
From: Bruce M Simpson <bms@FreeBSD.org>
Date: Fri, 9 Jul 2004 00:11:25 +0000
Subject: [PATCH] Actually turn on driver locking in xl(4).
---
sys/pci/if_xlreg.h | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/sys/pci/if_xlreg.h b/sys/pci/if_xlreg.h
index cdf11d4f5b8c..1c39f8d8bdf5 100644
--- a/sys/pci/if_xlreg.h
+++ b/sys/pci/if_xlreg.h
@@ -609,19 +609,9 @@ struct xl_softc {
struct mtx xl_mtx;
};
-/*
- * XXX: The driver still tries to sleep with locks held, so disable
- * locking for the time being.
- */
-#if 0
#define XL_LOCK(_sc) mtx_lock(&(_sc)->xl_mtx)
#define XL_UNLOCK(_sc) mtx_unlock(&(_sc)->xl_mtx)
#define XL_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->xl_mtx, MA_OWNED)
-#else
-#define XL_LOCK(x) do { } while (0)
-#define XL_UNLOCK(x) do { } while (0)
-#define XL_LOCK_ASSERT(x) do { } while (0)
-#endif
#define xl_rx_goodframes(x) \
((x.xl_upper_frames_ok & 0x03) << 8) | x.xl_rx_frames_ok