PERFORCE change 100556 for review

[Paolo Pisati]

http://perforce.freebsd.org/chv.cgi?CH=100556

Change 100556 by piso at piso_newluxor on 2006/07/04 09:45:26

	Axe 4.x support.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#5 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#5 (text+ko) ====

@@ -66,10 +66,6 @@
 
 #ifdef _KERNEL
 
-#if __FreeBSD_version >= 500000
-
-/* Fine grained locking for 5.x, 6.x and 7.x */
-
 #define	LIBALIAS_LOCK_INIT(_chain) \
 	mtx_init(&(_chain)->mtx, "libalias list of proto-handlers", NULL, \
 		MTX_DEF | MTX_RECURSE)
@@ -127,57 +123,7 @@
 	if (mtx_initialized(&c->mtx))
 		LIBALIAS_LOCK_DESTROY(c);
 }
-#else
-
-/* Good old spl*() locking for 4.x */
-/* 
- * XXX - i'm not sure about mutex & conditional var
- * conversion that i did using spl*()... 
- */
-
-#define	LIBALIAS_LOCK_INIT(_chain)           (_chain)->spl = 0        	
-#define	LIBALIAS_LOCK_DESTROY(_chain)	
-#define	LIBALIAS_WLOCK_ASSERT(_chain)	do {				\
-        KASSERT(_chain->spl != 0, ("chain not locked"));                \
-} while (0)
-
-static __inline void
-LIBALIAS_RLOCK(struct chain *chain)
-{
-	chain->spl = splimp();
-}
-
-static __inline void
-LIBALIAS_RUNLOCK(struct chain *chain)
-{
-	splx(chain->spl);
-}
-
-static __inline void
-LIBALIAS_WLOCK(struct chain *chain)
-{
-	LIBALIAS_RLOCK(chain);
-}
-
-static __inline void
-LIBALIAS_WUNLOCK(struct chain *chain)
-{
-	LIBALIAS_RUNLOCK(chain);
-}
 
-static void
-_handler_chain_init(struct chain *c) {
-
-	c->spl = 0;
-}
-
-static void
-_handler_chain_destroy(struct chain *c) {
-
-	;
-}
-
-#endif
 #else
 
 #define	LIBALIAS_LOCK_INIT(_chain) ;