From owner-svn-src-projects@FreeBSD.ORG  Mon Jan 14 04:31:55 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 207B5ADC;
 Mon, 14 Jan 2013 04:31:55 +0000 (UTC)
 (envelope-from bryanv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 11E0BFF;
 Mon, 14 Jan 2013 04:31:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0E4VsqR029926;
 Mon, 14 Jan 2013 04:31:54 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0E4VsDL029925;
 Mon, 14 Jan 2013 04:31:54 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201301140431.r0E4VsDL029925@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Mon, 14 Jan 2013 04:31:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245404 - projects/vmxnet/sys/dev/vmware/vmxnet
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Jan 2013 04:31:55 -0000

Author: bryanv
Date: Mon Jan 14 04:31:54 2013
New Revision: 245404
URL: http://svnweb.freebsd.org/changeset/base/245404

Log:
  Remove special handling of SIOCSIFADDR
  
  Init is not especially expensive on vmxnet, so don't bother
  trying to avoid it when setting an inet address.
  
  opt_inet.h wasn't being included so this was dead code anyways.
  
  Approved by:	grehan (implicit)

Modified:
  projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c

Modified: projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c
==============================================================================
--- projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c	Mon Jan 14 04:30:21 2013	(r245403)
+++ projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c	Mon Jan 14 04:31:54 2013	(r245404)
@@ -840,10 +840,6 @@ vic_ioctl(struct ifnet *ifp, u_long cmd,
 {
 	struct vic_softc *sc;
 	struct ifreq *ifr;
-#if defined(INET) || defined(INET6)
-	struct ifaddr *ifa = data;
-	int avoid_reset = 0;
-#endif
 	int mask, error;
 
 	sc = ifp->if_softc;
@@ -851,27 +847,6 @@ vic_ioctl(struct ifnet *ifp, u_long cmd,
 	error = 0;
 
 	switch (cmd) {
-	case SIOCSIFADDR:
-#ifdef INET
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			avoid_reset = 1;
-#endif
-#ifdef INET6
-		if (ifa->ifa_addr->sa_family == AF_INET6)
-			avoid_reset = 1;
-#endif
-#if defined(INET) || defined(INET6)
-		if (avoid_reset != 0) {
-			ifp->if_flags |= IFF_UP;
-			if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
-				vic_init(adapter);
-			if ((ifp->if_flags & IFF_NOARP) == 0)
-				arp_ifinit(ifp, ifa);
-		} else
-			error = ether_ioctl(ifp, command, data);
-#endif
-		break;
-
 	case SIOCSIFMTU:
 		VIC_LOCK(sc);
 		if (ifr->ifr_mtu < ETHERMIN)