From owner-svn-src-all@FreeBSD.ORG  Mon Jul 15 01:41:35 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 43237997;
 Mon, 15 Jul 2013 01:41:35 +0000 (UTC)
 (envelope-from rodrigc@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 1BBBAE41;
 Mon, 15 Jul 2013 01:41:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6F1fYMF084093;
 Mon, 15 Jul 2013 01:41:34 GMT (envelope-from rodrigc@svn.freebsd.org)
Received: (from rodrigc@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6F1fYvN084092;
 Mon, 15 Jul 2013 01:41:34 GMT (envelope-from rodrigc@svn.freebsd.org)
Message-Id: <201307150141.r6F1fYvN084092@svn.freebsd.org>
From: Craig Rodrigues <rodrigc@FreeBSD.org>
Date: Mon, 15 Jul 2013 01:41:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253347 - head/sys/netgraph/bluetooth/drivers/ubt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Jul 2013 01:41:35 -0000

Author: rodrigc
Date: Mon Jul 15 01:41:34 2013
New Revision: 253347
URL: http://svnweb.freebsd.org/changeset/base/253347

Log:
  PR: kern/168520
  
  Revert GRN 253255.  It is not needed now that GRN 253346 is committed.

Modified:
  head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c

Modified: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==============================================================================
--- head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Mon Jul 15 01:32:55 2013	(r253346)
+++ head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Mon Jul 15 01:41:34 2013	(r253347)
@@ -109,9 +109,7 @@
 #include <sys/unistd.h>
 #include <sys/callout.h>
 #include <sys/malloc.h>
-#include <sys/jail.h>
 #include <sys/priv.h>
-#include <sys/proc.h>
 
 #include "usbdevs.h"
 #include <dev/usb/usb.h>
@@ -125,7 +123,6 @@
 #include <sys/mbuf.h>
 #include <sys/taskqueue.h>
 
-#include <net/vnet.h>
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
 #include <netgraph/ng_parse.h>
@@ -490,14 +487,13 @@ ubt_attach(device_t dev)
 
 	sc->sc_dev = dev;
 	sc->sc_debug = NG_UBT_WARN_LEVEL;
-	CURVNET_SET(TD_TO_VNET(curthread));
+
 	/* 
 	 * Create Netgraph node
 	 */
 
 	if (ng_make_node_common(&typestruct, &sc->sc_node) != 0) {
 		UBT_ALERT(sc, "could not create Netgraph node\n");
-		CURVNET_RESTORE();
 		return (ENXIO);
 	}
 
@@ -505,12 +501,10 @@ ubt_attach(device_t dev)
 	if (ng_name_node(sc->sc_node, device_get_nameunit(dev)) != 0) {
 		UBT_ALERT(sc, "could not name Netgraph node\n");
 		NG_NODE_UNREF(sc->sc_node);
-		CURVNET_RESTORE();
 		return (ENXIO);
 	}
 	NG_NODE_SET_PRIVATE(sc->sc_node, sc);
 	NG_NODE_FORCE_WRITER(sc->sc_node);
-	CURVNET_RESTORE();
 
 	/*
 	 * Initialize device softc structure
@@ -637,10 +631,8 @@ ubt_detach(device_t dev)
 	/* Destroy Netgraph node */
 	if (node != NULL) {
 		sc->sc_node = NULL;
-		CURVNET_SET(node->nd_vnet);
 		NG_NODE_REALLY_DIE(node);
 		ng_rmnode_self(node);
-		CURVNET_RESTORE();
 	}
 
 	/* Make sure ubt_task in gone */