diff options
author | bms <bms@FreeBSD.org> | 2004-07-09 00:11:25 +0000 |
---|---|---|
committer | bms <bms@FreeBSD.org> | 2004-07-09 00:11:25 +0000 |
commit | e2d65a49fd7ba24ab1d18539dbd7e5d6964b9523 (patch) | |
tree | ab28b08be829fb8497ca9a25f72c95832647e4d6 /sys/pci/if_xlreg.h | |
parent | 16dd7607ceb1ff716efac96780892831233cba0b (diff) | |
download | FreeBSD-src-e2d65a49fd7ba24ab1d18539dbd7e5d6964b9523.zip FreeBSD-src-e2d65a49fd7ba24ab1d18539dbd7e5d6964b9523.tar.gz |
Actually turn on driver locking in xl(4).
Diffstat (limited to 'sys/pci/if_xlreg.h')
-rw-r--r-- | sys/pci/if_xlreg.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sys/pci/if_xlreg.h b/sys/pci/if_xlreg.h index cdf11d4..1c39f8d 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 |