svn commit: r194052 - head/sys/netinet6

[Marko Zec]

Author: zec
Date: Fri Jun 12 09:31:14 2009
New Revision: 194052
URL: http://svn.freebsd.org/changeset/base/194052

Log:
  Remove unnecessary #ifdef lines and code.
  
  Approved by:	julian (mentor)

Modified:
  head/sys/netinet6/mld6.c

Modified: head/sys/netinet6/mld6.c
==============================================================================
--- head/sys/netinet6/mld6.c	Fri Jun 12 09:20:31 2009	(r194051)
+++ head/sys/netinet6/mld6.c	Fri Jun 12 09:31:14 2009	(r194052)
@@ -149,13 +149,8 @@ static int	mld_v2_process_group_query(st
 static int	sysctl_mld_gsr(SYSCTL_HANDLER_ARGS);
 static int	sysctl_mld_ifinfo(SYSCTL_HANDLER_ARGS);
 
-#ifdef VIMAGE
 static vnet_attach_fn	vnet_mld_iattach;
 static vnet_detach_fn	vnet_mld_idetach;
-#else
-static int	vnet_mld_iattach(const void *);
-static int	vnet_mld_idetach(const void *);
-#endif /* VIMAGE */
 
 /*
  * Normative references: RFC 2710, RFC 3590, RFC 3810.
@@ -3296,9 +3291,7 @@ mld_modevent(module_t mod, int type, voi
 	break;
     case MOD_UNLOAD:
 #ifndef VIMAGE_GLOBALS
-#ifdef NOTYET
 	vnet_mod_deregister(&vnet_mld_modinfo);
-#endif
 #else
 	vnet_mld_idetach(NULL);
 #endif