diff options
| author | rodrigc <rodrigc@FreeBSD.org> | 2013-07-12 08:03:10 +0000 |
|---|---|---|
| committer | rodrigc <rodrigc@FreeBSD.org> | 2013-07-12 08:03:10 +0000 |
| commit | d492e75fbda4134aac43b1cef4237817df2c8979 (patch) | |
| tree | f029bf9929fb0d190237caae3ab49a03f5b33c20 /sys/netgraph | |
| parent | 72f878ef47e5cfe367c8b91bbf358cbfea03eb8c (diff) | |
| download | FreeBSD-src-d492e75fbda4134aac43b1cef4237817df2c8979.zip FreeBSD-src-d492e75fbda4134aac43b1cef4237817df2c8979.tar.gz | |
PR: kern/168520
Submitted by: "YAMAMOTO, Shigeru" <shigeru@iij.ad.jp>
Reviewed by: adrian
In PC-BSD 9.1, VIMAGE is enabled in the kernel config.
For laptops with Bluetooth capability, such as the HP Elitebook 8460p,
the kernel will panic upon bootup, because curthread->td_vnet
is not initialized.
Properly initialize curthread->td_vnet when initializing the Bluetooth stack.
This allows laptops such as the HP Elitebook 8460p laptop
to properly boot with VIMAGE kernels.
Diffstat (limited to 'sys/netgraph')
| -rw-r--r-- | sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c index b268409..402f958 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c @@ -109,7 +109,9 @@ #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> @@ -123,6 +125,7 @@ #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> @@ -487,13 +490,14 @@ 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); } @@ -501,10 +505,12 @@ 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 @@ -631,8 +637,10 @@ 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 */ |
