From owner-p4-projects@FreeBSD.ORG  Sat May  9 02:00:44 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0FEE91065676; Sat,  9 May 2009 02:00:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C50F71065670
	for <perforce@freebsd.org>; Sat,  9 May 2009 02:00:43 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B3F9E8FC13
	for <perforce@freebsd.org>; Sat,  9 May 2009 02:00:43 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4920hQp060610
	for <perforce@freebsd.org>; Sat, 9 May 2009 02:00:43 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4920hHp060608
	for perforce@freebsd.org; Sat, 9 May 2009 02:00:43 GMT
	(envelope-from zec@fer.hr)
Date: Sat, 9 May 2009 02:00:43 GMT
Message-Id: <200905090200.n4920hHp060608@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 161805 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 May 2009 02:00:45 -0000

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

Change 161805 by zec@zec_tpx32 on 2009/05/09 01:59:51

	Introduce ethernet-specific method for reassigning ifnets
	from one vnet to another.
	
	While here, make sure that we only print out ifnet's ethernet
	address on console when it gets attached in the default vnet.
	Obtained from:	vimage branch in p4

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#25 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#25 (text+ko) ====

@@ -924,6 +924,25 @@
 	return (etherbuf);
 }
 
+#ifdef VIMAGE
+static void
+ether_reassign(struct ifnet *ifp, struct vnet *vnet, char *dname)
+{
+	u_char eaddr[6];
+
+	bcopy(IF_LLADDR(ifp), eaddr, 6);
+	ether_ifdetach(ifp);
+	ifp->if_bpf = NULL;
+	if_reassign_common(ifp, vnet, "eth");
+	if (dname)
+		snprintf(ifp->if_xname, IFNAMSIZ, "%s", dname);
+
+	CURVNET_SET_QUIET(vnet);
+	ether_ifattach(ifp, eaddr);
+	CURVNET_RESTORE();
+}
+#endif
+
 /*
  * Perform common duties while attaching to interface list
  */
@@ -933,6 +952,9 @@
 	int i;
 	struct ifaddr *ifa;
 	struct sockaddr_dl *sdl;
+#ifdef VIMAGE
+	struct vnet *home_vnet_0 = ifp->if_home_vnet;
+#endif
 
 	ifp->if_addrlen = ETHER_ADDR_LEN;
 	ifp->if_hdrlen = ETHER_HDR_LEN;
@@ -941,6 +963,9 @@
 	ifp->if_output = ether_output;
 	ifp->if_input = ether_input;
 	ifp->if_resolvemulti = ether_resolvemulti;
+#ifdef VIMAGE
+	ifp->if_reassign = ether_reassign;
+#endif
 	if (ifp->if_baudrate == 0)
 		ifp->if_baudrate = IF_Mbps(10);		/* just a default */
 	ifp->if_broadcastaddr = etherbroadcastaddr;
@@ -960,7 +985,11 @@
 	for (i = 0; i < ifp->if_addrlen; i++)
 		if (lla[i] != 0)
 			break; 
+#ifdef VIMAGE
+	if (i != ifp->if_addrlen && home_vnet_0 != ifp->if_home_vnet)
+#else
 	if (i != ifp->if_addrlen)
+#endif
 		if_printf(ifp, "Ethernet address: %6D\n", lla, ":");
 }