[Midnightbsd-cvs] src [9930] trunk/sys/netgraph/bluetooth/socket: sync
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri May 25 09:15:48 EDT 2018
Revision: 9930
http://svnweb.midnightbsd.org/src/?rev=9930
Author: laffer1
Date: 2018-05-25 09:15:48 -0400 (Fri, 25 May 2018)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/sys/netgraph/bluetooth/socket/TODO
trunk/sys/netgraph/bluetooth/socket/ng_btsocket.c
trunk/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
trunk/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
trunk/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
Property Changed:
----------------
trunk/sys/netgraph/bluetooth/socket/TODO
Modified: trunk/sys/netgraph/bluetooth/socket/TODO
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/TODO 2018-05-25 13:15:11 UTC (rev 9929)
+++ trunk/sys/netgraph/bluetooth/socket/TODO 2018-05-25 13:15:48 UTC (rev 9930)
@@ -1,5 +1,6 @@
-$Id: TODO,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
-$FreeBSD$
+$Id: TODO,v 1.1 2002/11/24 19:47:07 max Exp $
+$FreeBSD: stable/10/sys/netgraph/bluetooth/socket/TODO 114878 2003-05-10 21:44:42Z julian $
+$MidnightBSD$
FIXME/TODO list
Property changes on: trunk/sys/netgraph/bluetooth/socket/TODO
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket.c 2018-05-25 13:15:11 UTC (rev 9929)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket.c 2018-05-25 13:15:48 UTC (rev 9930)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* ng_btsocket.c
*/
@@ -27,8 +28,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ng_btsocket.c,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_btsocket.c,v 1.4 2003/09/14 23:29:06 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/socket/ng_btsocket.c 253346 2013-07-15 01:32:55Z rodrigc $
*/
#include <sys/param.h>
@@ -46,6 +47,8 @@
#include <sys/sysctl.h>
#include <sys/taskqueue.h>
+#include <net/vnet.h>
+
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>
#include <netgraph/bluetooth/include/ng_bluetooth.h>
@@ -285,4 +288,4 @@
return (error);
} /* ng_btsocket_modevent */
-DOMAIN_SET(ng_btsocket_);
+VNET_DOMAIN_SET(ng_btsocket_);
Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c 2018-05-25 13:15:11 UTC (rev 9929)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c 2018-05-25 13:15:48 UTC (rev 9930)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* ng_btsocket_hci_raw.c
*/
@@ -27,8 +28,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ng_btsocket_hci_raw.c,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_btsocket_hci_raw.c,v 1.14 2003/09/14 23:29:06 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c 268061 2014-06-30 19:46:17Z trociny $
*/
#include <sys/param.h>
@@ -51,6 +52,9 @@
#include <sys/socketvar.h>
#include <sys/sysctl.h>
#include <sys/taskqueue.h>
+
+#include <net/vnet.h>
+
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>
#include <netgraph/bluetooth/include/ng_bluetooth.h>
@@ -310,7 +314,7 @@
* for now
*/
- MGET(nam, M_DONTWAIT, MT_SONAME);
+ MGET(nam, M_NOWAIT, MT_SONAME);
if (nam != NULL) {
struct sockaddr_hci *sa = mtod(nam, struct sockaddr_hci *);
@@ -519,7 +523,7 @@
* will check if socket has enough buffer space.
*/
- m = m_dup(m0, M_DONTWAIT);
+ m = m_dup(m0, M_NOWAIT);
if (m != NULL) {
struct mbuf *ctl = NULL;
@@ -728,6 +732,10 @@
bitstr_t *f = NULL;
int error = 0;
+ /* Skip initialization of globals for non-default instances. */
+ if (!IS_DEFAULT_VNET(curvnet))
+ return;
+
ng_btsocket_hci_raw_node = NULL;
ng_btsocket_hci_raw_debug_level = NG_BTSOCKET_WARN_LEVEL;
ng_btsocket_hci_raw_ioctl_timeout = 5;
@@ -1585,7 +1593,7 @@
sa = (struct sockaddr *) &pcb->addr;
}
- MGET(nam, M_DONTWAIT, MT_SONAME);
+ MGET(nam, M_NOWAIT, MT_SONAME);
if (nam == NULL) {
mtx_unlock(&pcb->pcb_mtx);
error = ENOBUFS;
Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c 2018-05-25 13:15:11 UTC (rev 9929)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c 2018-05-25 13:15:48 UTC (rev 9930)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* ng_btsocket_l2cap.c
*/
@@ -27,8 +28,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ng_btsocket_l2cap.c,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_btsocket_l2cap.c,v 1.16 2003/09/14 23:29:06 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c 268061 2014-06-30 19:46:17Z trociny $
*/
#include <sys/param.h>
@@ -1533,7 +1534,7 @@
* it is a broadcast traffic after all
*/
- copy = m_dup(m, M_DONTWAIT);
+ copy = m_dup(m, M_NOWAIT);
if (copy != NULL) {
sbappendrecord(&pcb->so->so_rcv, copy);
sorwakeup(pcb->so);
@@ -1813,6 +1814,10 @@
{
int error = 0;
+ /* Skip initialization of globals for non-default instances. */
+ if (!IS_DEFAULT_VNET(curvnet))
+ return;
+
ng_btsocket_l2cap_node = NULL;
ng_btsocket_l2cap_debug_level = NG_BTSOCKET_WARN_LEVEL;
@@ -2513,12 +2518,12 @@
if (pcb->so->so_snd.sb_cc == 0)
return (EINVAL); /* XXX */
- m = m_dup(pcb->so->so_snd.sb_mb, M_DONTWAIT);
+ m = m_dup(pcb->so->so_snd.sb_mb, M_NOWAIT);
if (m == NULL)
return (ENOBUFS);
/* Create L2CA packet header */
- M_PREPEND(m, sizeof(*hdr), M_DONTWAIT);
+ M_PREPEND(m, sizeof(*hdr), M_NOWAIT);
if (m != NULL)
if (m->m_len < sizeof(*hdr))
m = m_pullup(m, sizeof(*hdr));
Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c 2018-05-25 13:15:11 UTC (rev 9929)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c 2018-05-25 13:15:48 UTC (rev 9930)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* ng_btsocket_l2cap_raw.c
*/
@@ -27,8 +28,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ng_btsocket_l2cap_raw.c,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_btsocket_l2cap_raw.c,v 1.12 2003/09/14 23:29:06 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c 268061 2014-06-30 19:46:17Z trociny $
*/
#include <sys/param.h>
@@ -50,6 +51,9 @@
#include <sys/socketvar.h>
#include <sys/sysctl.h>
#include <sys/taskqueue.h>
+
+#include <net/vnet.h>
+
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>
#include <netgraph/bluetooth/include/ng_bluetooth.h>
@@ -513,6 +517,10 @@
{
int error = 0;
+ /* Skip initialization of globals for non-default instances. */
+ if (!IS_DEFAULT_VNET(curvnet))
+ return;
+
ng_btsocket_l2cap_raw_node = NULL;
ng_btsocket_l2cap_raw_debug_level = NG_BTSOCKET_WARN_LEVEL;
ng_btsocket_l2cap_raw_ioctl_timeout = 5;
Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c 2018-05-25 13:15:11 UTC (rev 9929)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c 2018-05-25 13:15:48 UTC (rev 9930)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* ng_btsocket_rfcomm.c
*/
@@ -27,8 +28,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ng_btsocket_rfcomm.c,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_btsocket_rfcomm.c,v 1.28 2003/09/14 23:29:06 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c 268061 2014-06-30 19:46:17Z trociny $
*/
#include <sys/param.h>
@@ -328,6 +329,11 @@
void
ng_btsocket_rfcomm_init(void)
{
+
+ /* Skip initialization of globals for non-default instances. */
+ if (!IS_DEFAULT_VNET(curvnet))
+ return;
+
ng_btsocket_rfcomm_debug_level = NG_BTSOCKET_WARN_LEVEL;
ng_btsocket_rfcomm_timo = 60;
@@ -3005,7 +3011,7 @@
/* NOT REACHED */
}
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return (ENOBUFS);
@@ -3036,7 +3042,7 @@
mtx_assert(&s->session_mtx, MA_OWNED);
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
NG_FREE_M(data);
return (ENOBUFS);
@@ -3043,7 +3049,7 @@
}
m->m_pkthdr.len = m->m_len = sizeof(*hdr);
- MGET(mcrc, M_DONTWAIT, MT_DATA);
+ MGET(mcrc, M_NOWAIT, MT_DATA);
if (mcrc == NULL) {
NG_FREE_M(data);
return (ENOBUFS);
@@ -3110,7 +3116,7 @@
mtx_assert(&pcb->session->session_mtx, MA_OWNED);
mtx_assert(&pcb->pcb_mtx, MA_OWNED);
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return (ENOBUFS);
@@ -3148,7 +3154,7 @@
mtx_assert(&pcb->session->session_mtx, MA_OWNED);
mtx_assert(&pcb->pcb_mtx, MA_OWNED);
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return (ENOBUFS);
@@ -3519,7 +3525,7 @@
struct mbuf *top = NULL, *m = NULL, *n = NULL, *nextpkt = NULL;
int mlen, noff, len;
- MGETHDR(top, M_DONTWAIT, MT_DATA);
+ MGETHDR(top, M_NOWAIT, MT_DATA);
if (top == NULL)
return (NULL);
@@ -3543,7 +3549,7 @@
length -= len;
if (length > 0 && m->m_len == mlen) {
- MGET(m->m_next, M_DONTWAIT, MT_DATA);
+ MGET(m->m_next, M_NOWAIT, MT_DATA);
if (m->m_next == NULL) {
NG_FREE_M(top);
return (NULL);
Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c 2018-05-25 13:15:11 UTC (rev 9929)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c 2018-05-25 13:15:48 UTC (rev 9930)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* ng_btsocket_sco.c
*/
@@ -27,8 +28,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ng_btsocket_sco.c,v 1.1.1.1 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_btsocket_sco.c,v 1.2 2005/10/31 18:08:51 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c 268061 2014-06-30 19:46:17Z trociny $
*/
#include <sys/param.h>
@@ -1107,6 +1108,10 @@
{
int error = 0;
+ /* Skip initialization of globals for non-default instances. */
+ if (!IS_DEFAULT_VNET(curvnet))
+ return;
+
ng_btsocket_sco_node = NULL;
ng_btsocket_sco_debug_level = NG_BTSOCKET_WARN_LEVEL;
@@ -1746,7 +1751,7 @@
while (pcb->rt->pending < pcb->rt->num_pkts &&
pcb->so->so_snd.sb_cc > 0) {
/* Get a copy of the first packet on send queue */
- m = m_dup(pcb->so->so_snd.sb_mb, M_DONTWAIT);
+ m = m_dup(pcb->so->so_snd.sb_mb, M_NOWAIT);
if (m == NULL) {
error = ENOBUFS;
break;
@@ -1753,7 +1758,7 @@
}
/* Create SCO packet header */
- M_PREPEND(m, sizeof(*hdr), M_DONTWAIT);
+ M_PREPEND(m, sizeof(*hdr), M_NOWAIT);
if (m != NULL)
if (m->m_len < sizeof(*hdr))
m = m_pullup(m, sizeof(*hdr));
More information about the Midnightbsd-cvs
mailing list