From owner-svn-src-head@FreeBSD.ORG  Fri Jun 12 09:31:14 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 591A71065672;
	Fri, 12 Jun 2009 09:31:14 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 46CC18FC17;
	Fri, 12 Jun 2009 09:31:14 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5C9VE6X076449;
	Fri, 12 Jun 2009 09:31:14 GMT (envelope-from zec@svn.freebsd.org)
Received: (from zec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5C9VEmU076448;
	Fri, 12 Jun 2009 09:31:14 GMT (envelope-from zec@svn.freebsd.org)
Message-Id: <200906120931.n5C9VEmU076448@svn.freebsd.org>
From: Marko Zec <zec@FreeBSD.org>
Date: Fri, 12 Jun 2009 09:31:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194052 - head/sys/netinet6
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Jun 2009 09:31:14 -0000

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