From owner-svn-src-stable@FreeBSD.ORG  Mon Oct 28 22:41:36 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id AF94A3E1;
 Mon, 28 Oct 2013 22:41:36 +0000 (UTC)
 (envelope-from grehan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9C7782561;
 Mon, 28 Oct 2013 22:41:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9SMfaWs070167;
 Mon, 28 Oct 2013 22:41:36 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9SMfawT070166;
 Mon, 28 Oct 2013 22:41:36 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201310282241.r9SMfawT070166@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Mon, 28 Oct 2013 22:41:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r257285 - stable/10/sys/net
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Oct 2013 22:41:36 -0000

Author: grehan
Date: Mon Oct 28 22:41:36 2013
New Revision: 257285
URL: http://svnweb.freebsd.org/changeset/base/257285

Log:
  MFC r257078
    Fix panic in the tap driver when a tap and vmnet interface were
    created after each other e.g.
  
     ifconfig tap0
     ifconfig vmnet0
     <panic>
  
    Appears to be a cut'n'paste error from the tap code to the vmnet
    code where the name string wasn't updated in the call to make_dev().
  
  Approved by:  re (glebius)

Modified:
  stable/10/sys/net/if_tap.c
Directory Properties:
  stable/10/sys/   (props changed)

Modified: stable/10/sys/net/if_tap.c
==============================================================================
--- stable/10/sys/net/if_tap.c	Mon Oct 28 22:26:03 2013	(r257284)
+++ stable/10/sys/net/if_tap.c	Mon Oct 28 22:41:36 2013	(r257285)
@@ -205,7 +205,7 @@ vmnet_clone_create(struct if_clone *ifc,
 	i = clone_create(&tapclones, &tap_cdevsw, &unit, &dev, VMNET_DEV_MASK);
 	if (i) {
 		dev = make_dev(&tap_cdevsw, unit | VMNET_DEV_MASK, UID_ROOT,
-		    GID_WHEEL, 0600, "%s%d", tapname, unit);
+		    GID_WHEEL, 0600, "%s%d", vmnetname, unit);
 	}
 
 	tapcreate(dev);