diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2007-08-06 14:26:03 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2007-08-06 14:26:03 +0000 |
| commit | 0bf686c1257e2e7944a4cee9d9d628280facaa3d (patch) | |
| tree | 63e9e0c42ec5669b83e25b5f9cbdcbee7e1be6dc /sys/pci | |
| parent | ec2af96ad1603562dcbcad9de48a2d0692367e14 (diff) | |
| download | src-0bf686c1257e2e7944a4cee9d9d628280facaa3d.tar.gz src-0bf686c1257e2e7944a4cee9d9d628280facaa3d.zip | |
Remove the now-unused NET_{LOCK,UNLOCK,ASSERT}_GIANT() macros, which
previously conditionally acquired Giant based on debug.mpsafenet. As that
has now been removed, they are no longer required. Removing them
significantly simplifies error-handling in the socket layer, eliminated
quite a bit of unwinding of locking in error cases.
While here clean up the now unneeded opt_net.h, which previously was used
for the NET_WITH_GIANT kernel option. Clean up some related gotos for
consistency.
Reviewed by: bz, csjp
Tested by: kris
Approved by: re (kensmith)
Notes
Notes:
svn path=/head/; revision=171744
Diffstat (limited to 'sys/pci')
| -rw-r--r-- | sys/pci/if_xl.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c index 55e4f7dfbbb0..e82511dcac70 100644 --- a/sys/pci/if_xl.c +++ b/sys/pci/if_xl.c @@ -2102,12 +2102,10 @@ xl_rxeof_task(void *arg, int pending) { struct xl_softc *sc = (struct xl_softc *)arg; - NET_LOCK_GIANT(); XL_LOCK(sc); if (sc->xl_ifp->if_drv_flags & IFF_DRV_RUNNING) xl_rxeof(sc); XL_UNLOCK(sc); - NET_UNLOCK_GIANT(); } /* |