[Midnightbsd-cvs] src [9931] trunk/sys/netgraph/bluetooth/l2cap: sync with freebsd

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri May 25 16:02:42 EDT 2018


Revision: 9931
          http://svnweb.midnightbsd.org/src/?rev=9931
Author:   laffer1
Date:     2018-05-25 16:02:41 -0400 (Fri, 25 May 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/sys/netgraph/bluetooth/common/ng_bluetooth.c
    trunk/sys/netgraph/bluetooth/hci/TODO
    trunk/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
    trunk/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
    trunk/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
    trunk/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
    trunk/sys/netgraph/bluetooth/hci/ng_hci_main.c
    trunk/sys/netgraph/bluetooth/hci/ng_hci_misc.c
    trunk/sys/netgraph/bluetooth/hci/ng_hci_misc.h
    trunk/sys/netgraph/bluetooth/hci/ng_hci_prse.h
    trunk/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
    trunk/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
    trunk/sys/netgraph/bluetooth/hci/ng_hci_var.h
    trunk/sys/netgraph/bluetooth/include/ng_bluetooth.h
    trunk/sys/netgraph/bluetooth/include/ng_bt3c.h
    trunk/sys/netgraph/bluetooth/include/ng_btsocket.h
    trunk/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
    trunk/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
    trunk/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
    trunk/sys/netgraph/bluetooth/include/ng_btsocket_sco.h
    trunk/sys/netgraph/bluetooth/include/ng_h4.h
    trunk/sys/netgraph/bluetooth/include/ng_hci.h
    trunk/sys/netgraph/bluetooth/include/ng_l2cap.h
    trunk/sys/netgraph/bluetooth/include/ng_ubt.h
    trunk/sys/netgraph/bluetooth/l2cap/TODO
    trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
    trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
    trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
    trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
    trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
    trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
    trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
    trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
    trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
    trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
    trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
    trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
    trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h

Property Changed:
----------------
    trunk/sys/netgraph/bluetooth/hci/TODO
    trunk/sys/netgraph/bluetooth/l2cap/TODO

Modified: trunk/sys/netgraph/bluetooth/common/ng_bluetooth.c
===================================================================
--- trunk/sys/netgraph/bluetooth/common/ng_bluetooth.c	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/common/ng_bluetooth.c	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * bluetooth.c
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_bluetooth.c,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_bluetooth.c,v 1.3 2003/04/26 22:37:31 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/common/ng_bluetooth.c 273736 2014-10-27 14:38:00Z hselasky $
  */
 
 #include <sys/param.h>
@@ -57,7 +58,7 @@
 
 SYSCTL_NODE(_net, OID_AUTO, bluetooth, CTLFLAG_RW, 0, "Bluetooth family");
 SYSCTL_INT(_net_bluetooth, OID_AUTO, version,
-	CTLFLAG_RD, 0, NG_BLUETOOTH_VERSION, "Version of the stack");
+	CTLFLAG_RD, SYSCTL_NULL_INT_PTR, NG_BLUETOOTH_VERSION, "Version of the stack");
 
 /* 
  * HCI

Modified: trunk/sys/netgraph/bluetooth/hci/TODO
===================================================================
--- trunk/sys/netgraph/bluetooth/hci/TODO	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/hci/TODO	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,5 +1,6 @@
-$Id: TODO,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
-$FreeBSD$
+$Id: TODO,v 1.2 2003/04/26 22:36:29 max Exp $
+$FreeBSD: stable/10/sys/netgraph/bluetooth/hci/TODO 114878 2003-05-10 21:44:42Z julian $
+$MidnightBSD$
 
 FIXME/TODO list
 


Property changes on: trunk/sys/netgraph/bluetooth/hci/TODO
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
===================================================================
--- trunk/sys/netgraph/bluetooth/hci/ng_hci_cmds.c	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/hci/ng_hci_cmds.c	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_hci_cmds.c
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_hci_cmds.c,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_hci_cmds.c,v 1.4 2003/09/08 18:57:51 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/hci/ng_hci_cmds.c 243882 2012-12-05 08:04:20Z glebius $
  */
 
 #include <sys/param.h>
@@ -118,7 +119,7 @@
 
 	ng_hci_mtap(unit, m0);
 
-	m = m_dup(m0, M_DONTWAIT);
+	m = m_dup(m0, M_NOWAIT);
 	if (m != NULL)
 		NG_SEND_DATA_ONLY(error, unit->drv, m);
 	else

Modified: trunk/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
===================================================================
--- trunk/sys/netgraph/bluetooth/hci/ng_hci_cmds.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/hci/ng_hci_cmds.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_hci_cmds.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_hci_cmds.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_hci_cmds.h,v 1.1 2002/11/24 19:46:58 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/hci/ng_hci_cmds.h 139823 2005-01-07 01:45:51Z imp $
  */
 
 #ifndef _NETGRAPH_HCI_CMDS_H_

Modified: trunk/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
===================================================================
--- trunk/sys/netgraph/bluetooth/hci/ng_hci_evnt.c	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/hci/ng_hci_evnt.c	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_hci_evnt.c
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_hci_evnt.c,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_hci_evnt.c,v 1.6 2003/09/08 18:57:51 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/hci/ng_hci_evnt.c 243882 2012-12-05 08:04:20Z glebius $
  */
 
 #include <sys/param.h>
@@ -511,7 +512,7 @@
 			} __attribute__ ((packed))			*lp;
 			struct mbuf					*m;
 
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m != NULL) {
 				m->m_pkthdr.len = m->m_len = sizeof(*lp);
 				lp = mtod(m, struct __link_policy *);

Modified: trunk/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
===================================================================
--- trunk/sys/netgraph/bluetooth/hci/ng_hci_evnt.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/hci/ng_hci_evnt.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_hci_evnt.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_hci_evnt.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_hci_evnt.h,v 1.1 2002/11/24 19:46:58 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/hci/ng_hci_evnt.h 139823 2005-01-07 01:45:51Z imp $
  */
 
 #ifndef _NETGRAPH_HCI_EVNT_H_

Modified: trunk/sys/netgraph/bluetooth/hci/ng_hci_main.c
===================================================================
--- trunk/sys/netgraph/bluetooth/hci/ng_hci_main.c	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/hci/ng_hci_main.c	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_hci_main.c
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_hci_main.c,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_hci_main.c,v 1.2 2003/03/18 00:09:36 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/hci/ng_hci_main.c 220768 2011-04-18 09:12:27Z glebius $
  */
 
 #include <sys/param.h>

Modified: trunk/sys/netgraph/bluetooth/hci/ng_hci_misc.c
===================================================================
--- trunk/sys/netgraph/bluetooth/hci/ng_hci_misc.c	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/hci/ng_hci_misc.c	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_hci_misc.c
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_hci_misc.c,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_hci_misc.c,v 1.5 2003/09/08 18:57:51 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/hci/ng_hci_misc.c 243882 2012-12-05 08:04:20Z glebius $
  */
 
 #include <sys/param.h>
@@ -65,7 +66,7 @@
 	int		 error = 0;
 
 	if (unit->raw != NULL && NG_HOOK_IS_VALID(unit->raw)) {
-		m = m_dup(m0, M_DONTWAIT);
+		m = m_dup(m0, M_NOWAIT);
 		if (m != NULL)
 			NG_SEND_DATA_ONLY(error, unit->raw, m);
 

Modified: trunk/sys/netgraph/bluetooth/hci/ng_hci_misc.h
===================================================================
--- trunk/sys/netgraph/bluetooth/hci/ng_hci_misc.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/hci/ng_hci_misc.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_hci_misc.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_hci_misc.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_hci_misc.h,v 1.3 2003/09/08 18:57:51 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/hci/ng_hci_misc.h 139823 2005-01-07 01:45:51Z imp $
  */
 
 #ifndef _NETGRAPH_HCI_MISC_H_

Modified: trunk/sys/netgraph/bluetooth/hci/ng_hci_prse.h
===================================================================
--- trunk/sys/netgraph/bluetooth/hci/ng_hci_prse.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/hci/ng_hci_prse.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_hci_prse.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_hci_prse.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_hci_prse.h,v 1.2 2003/03/18 00:09:36 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/hci/ng_hci_prse.h 139823 2005-01-07 01:45:51Z imp $
  */
 
 /***************************************************************************

Modified: trunk/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
===================================================================
--- trunk/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_hci_ulpi.c
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_hci_ulpi.c,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_hci_ulpi.c,v 1.7 2003/09/08 18:57:51 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c 250576 2013-05-12 16:43:26Z eadler $
  */
 
 #include <sys/param.h>
@@ -224,7 +225,7 @@
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		ng_hci_free_con(con);
 		error = ENOBUFS;
@@ -391,7 +392,7 @@
 
 		default:
 			panic(
-"%s: %s - Inavalid connection state=%d\n",
+"%s: %s - Invalid connection state=%d\n",
 				__func__, NG_NODE_NAME(unit->node),
 				sco_con->state);
 			break;
@@ -417,7 +418,7 @@
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		ng_hci_free_con(sco_con);
 		error = ENOBUFS;
@@ -531,7 +532,7 @@
 	 * Create HCI command
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto out;
@@ -776,7 +777,7 @@
 		 * Create HCI command 
 		 */
 
-		MGETHDR(m, M_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
@@ -996,7 +997,7 @@
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto out;

Modified: trunk/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
===================================================================
--- trunk/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_hci_ulpi.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_hci_ulpi.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_hci_ulpi.h,v 1.2 2003/04/26 22:35:21 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h 139823 2005-01-07 01:45:51Z imp $
  */
 
 #ifndef _NETGRAPH_HCI_ULPI_H_

Modified: trunk/sys/netgraph/bluetooth/hci/ng_hci_var.h
===================================================================
--- trunk/sys/netgraph/bluetooth/hci/ng_hci_var.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/hci/ng_hci_var.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_hci_var.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_hci_var.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_hci_var.h,v 1.3 2003/04/26 22:35:21 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/hci/ng_hci_var.h 139823 2005-01-07 01:45:51Z imp $
  */
 
 #ifndef _NETGRAPH_HCI_VAR_H_

Modified: trunk/sys/netgraph/bluetooth/include/ng_bluetooth.h
===================================================================
--- trunk/sys/netgraph/bluetooth/include/ng_bluetooth.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/include/ng_bluetooth.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * bluetooth.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_bluetooth.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_bluetooth.h,v 1.4 2003/04/26 22:32:34 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/include/ng_bluetooth.h 180399 2008-07-10 00:15:29Z emax $
  */
 
 #ifndef _NETGRAPH_BLUETOOTH_H_

Modified: trunk/sys/netgraph/bluetooth/include/ng_bt3c.h
===================================================================
--- trunk/sys/netgraph/bluetooth/include/ng_bt3c.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/include/ng_bt3c.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_bt3c.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_bt3c.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_bt3c.h,v 1.1 2002/11/24 19:47:05 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/include/ng_bt3c.h 139823 2005-01-07 01:45:51Z imp $
  *
  * XXX XXX XX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX 
  *

Modified: trunk/sys/netgraph/bluetooth/include/ng_btsocket.h
===================================================================
--- trunk/sys/netgraph/bluetooth/include/ng_btsocket.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/include/ng_btsocket.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_btsocket.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_btsocket.h,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_btsocket.h,v 1.8 2003/04/26 22:32:10 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/include/ng_btsocket.h 180399 2008-07-10 00:15:29Z emax $
  */
 
 #ifndef _NETGRAPH_BTSOCKET_H_

Modified: trunk/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
===================================================================
--- trunk/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_btsocket_hci_raw.h
  */
@@ -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.h,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_btsocket_hci_raw.h,v 1.3 2003/03/25 23:53:32 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h 160549 2006-07-21 17:11:15Z rwatson $
  */
 
 #ifndef _NETGRAPH_BTSOCKET_HCI_RAW_H_

Modified: trunk/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
===================================================================
--- trunk/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_btsocket_l2cap.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_btsocket_l2cap.h,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_btsocket_l2cap.h,v 1.4 2003/03/25 23:53:33 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h 160549 2006-07-21 17:11:15Z rwatson $
  */
 
 #ifndef _NETGRAPH_BTSOCKET_L2CAP_H_

Modified: trunk/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
===================================================================
--- trunk/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_btsocket_rfcomm.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_btsocket_rfcomm.h,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_btsocket_rfcomm.h,v 1.10 2003/03/29 22:27:42 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h 197083 2009-09-10 23:30:13Z emax $
  */
 
 #ifndef _NETGRAPH_BTSOCKET_RFCOMM_H_

Modified: trunk/sys/netgraph/bluetooth/include/ng_btsocket_sco.h
===================================================================
--- trunk/sys/netgraph/bluetooth/include/ng_btsocket_sco.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/include/ng_btsocket_sco.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_btsocket_sco.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_btsocket_sco.h,v 1.1.1.1 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_btsocket_sco.h,v 1.3 2005/10/31 18:08:52 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/include/ng_btsocket_sco.h 181033 2008-07-30 22:41:23Z emax $
  */
 
 #ifndef _NETGRAPH_BTSOCKET_SCO_H_

Modified: trunk/sys/netgraph/bluetooth/include/ng_h4.h
===================================================================
--- trunk/sys/netgraph/bluetooth/include/ng_h4.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/include/ng_h4.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_h4.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_h4.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_h4.h,v 1.1 2002/11/24 19:47:05 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/include/ng_h4.h 139823 2005-01-07 01:45:51Z imp $
  * 
  * Based on:
  * ---------

Modified: trunk/sys/netgraph/bluetooth/include/ng_hci.h
===================================================================
--- trunk/sys/netgraph/bluetooth/include/ng_hci.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/include/ng_hci.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_hci.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_hci.h,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_hci.h,v 1.2 2003/03/18 00:09:37 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/include/ng_hci.h 158672 2006-05-17 00:13:07Z emax $
  */
 
 /*

Modified: trunk/sys/netgraph/bluetooth/include/ng_l2cap.h
===================================================================
--- trunk/sys/netgraph/bluetooth/include/ng_l2cap.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/include/ng_l2cap.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_l2cap.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_l2cap.h,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_l2cap.h,v 1.2 2003/04/27 00:52:26 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/include/ng_l2cap.h 149679 2005-08-31 18:13:23Z emax $
  */
 
 /*

Modified: trunk/sys/netgraph/bluetooth/include/ng_ubt.h
===================================================================
--- trunk/sys/netgraph/bluetooth/include/ng_ubt.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/include/ng_ubt.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_ubt.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_ubt.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_ubt.h,v 1.6 2003/04/13 21:34:42 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/include/ng_ubt.h 139823 2005-01-07 01:45:51Z imp $
  */
 
 #ifndef _NG_UBT_H_

Modified: trunk/sys/netgraph/bluetooth/l2cap/TODO
===================================================================
--- trunk/sys/netgraph/bluetooth/l2cap/TODO	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/l2cap/TODO	2018-05-25 20:02:41 UTC (rev 9931)
@@ -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:06 max Exp $
+$FreeBSD: stable/10/sys/netgraph/bluetooth/l2cap/TODO 114878 2003-05-10 21:44:42Z julian $
+$MidnightBSD$
 
 FIXME/TODO list
 


Property changes on: trunk/sys/netgraph/bluetooth/l2cap/TODO
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
===================================================================
--- trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_l2cap_cmds.c
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_l2cap_cmds.c,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_l2cap_cmds.c,v 1.2 2003/09/08 19:11:45 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c 250460 2013-05-10 16:41:26Z eadler $
  */
 
 #include <sys/param.h>
@@ -306,7 +307,7 @@
 
 	/*
 	 * There still might be channels (in OPEN state?) that
-	 * did not submit any commands, so diconnect them
+	 * did not submit any commands, so disconnect them
 	 */
 
 	LIST_FOREACH(ch, &l2cap->chan_list, next)

Modified: trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
===================================================================
--- trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_l2cap_cmds.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_l2cap_cmds.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_l2cap_cmds.h,v 1.4 2003/04/01 18:15:26 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h 243882 2012-12-05 08:04:20Z glebius $
  */
 
 #ifndef _NETGRAPH_L2CAP_CMDS_H_
@@ -56,7 +57,7 @@
 		ng_l2cap_cmd_rej_data_t	 data;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -90,7 +91,7 @@
 		ng_l2cap_con_req_cp	 param;				\
 	} __attribute__ ((packed)) 	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -113,7 +114,7 @@
 		ng_l2cap_con_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -138,7 +139,7 @@
 		ng_l2cap_cfg_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) { 						\
 		NG_FREE_M((_data));					\
 		break;							\
@@ -172,7 +173,7 @@
 		ng_l2cap_cfg_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) { 						\
 		NG_FREE_M((_data));					\
 		break;							\
@@ -204,7 +205,7 @@
 do {									\
 	u_int8_t	*p = NULL;					\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -281,7 +282,7 @@
 		ng_l2cap_discon_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -304,7 +305,7 @@
 		ng_l2cap_discon_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -324,7 +325,7 @@
 do {									\
 	ng_l2cap_cmd_hdr_t	*c = NULL;				\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -351,7 +352,7 @@
 		ng_l2cap_info_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -374,7 +375,7 @@
 		ng_l2cap_info_rsp_data_t data;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\

Modified: trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
===================================================================
--- trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_l2cap_evnt.c
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_l2cap_evnt.c,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_l2cap_evnt.c,v 1.5 2003/09/08 19:11:45 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c 243882 2012-12-05 08:04:20Z glebius $
  */
 
 #include <sys/param.h>
@@ -192,7 +193,7 @@
 
 		/* Get the command, save the rest (if any) */
 		if (con->rx_pkt->m_pkthdr.len > hdr->length)
-			m = m_split(con->rx_pkt, hdr->length, M_DONTWAIT);
+			m = m_split(con->rx_pkt, hdr->length, M_NOWAIT);
 		else
 			m = NULL;
 

Modified: trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
===================================================================
--- trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_l2cap_evnt.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_l2cap_evnt.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_l2cap_evnt.h,v 1.1 2002/11/24 19:47:06 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h 139823 2005-01-07 01:45:51Z imp $
  */
 
 #ifndef _NETGRAPH_L2CAP_EVNT_H_

Modified: trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
===================================================================
--- trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_l2cap_llpi.c
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_l2cap_llpi.c,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_l2cap_llpi.c,v 1.5 2003/09/08 19:11:45 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c 243882 2012-12-05 08:04:20Z glebius $
  */
 
 #include <sys/param.h>
@@ -528,7 +529,7 @@
 		/* Check length of the packet against HCI MTU */
 		len = m0->m_pkthdr.len;
 		if (len > l2cap->pkt_size) {
-			m = m_split(m0, l2cap->pkt_size, M_DONTWAIT);
+			m = m_split(m0, l2cap->pkt_size, M_NOWAIT);
 			if (m == NULL) {
 				NG_L2CAP_ALERT(
 "%s: %s - m_split(%d) failed\n",	__func__, NG_NODE_NAME(l2cap->node),

Modified: trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
===================================================================
--- trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_l2cap_llpi.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_l2cap_llpi.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_l2cap_llpi.h,v 1.2 2003/04/28 21:44:59 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h 139823 2005-01-07 01:45:51Z imp $
  */
 
 #ifndef _NETGRAPH_L2CAP_LLPI_H_

Modified: trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
===================================================================
--- trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_l2cap_main.c
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_l2cap_main.c,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_l2cap_main.c,v 1.2 2003/04/28 21:44:59 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c 220768 2011-04-18 09:12:27Z glebius $
  */
 
 #include <sys/param.h>

Modified: trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
===================================================================
--- trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_l2cap_misc.c
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_l2cap_misc.c,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_l2cap_misc.c,v 1.5 2003/09/08 19:11:45 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c 243882 2012-12-05 08:04:20Z glebius $
  */
 
 #include <sys/param.h>
@@ -558,7 +559,7 @@
 struct mbuf *
 ng_l2cap_prepend(struct mbuf *m, int size)
 {
-	M_PREPEND(m, size, M_DONTWAIT);
+	M_PREPEND(m, size, M_NOWAIT);
 	if (m == NULL || (m->m_len < size && (m = m_pullup(m, size)) == NULL))
 		return (NULL);
 

Modified: trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
===================================================================
--- trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_l2cap_misc.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_l2cap_misc.h,v 1.1.1.4 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_l2cap_misc.h,v 1.3 2003/09/08 19:11:45 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h 184205 2008-10-23 15:53:51Z des $
  */
 
 #ifndef _NETGRAPH_L2CAP_MISC_H_

Modified: trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
===================================================================
--- trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_l2cap_prse.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_l2cap_prse.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_l2cap_prse.h,v 1.2 2003/04/28 21:44:59 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h 139823 2005-01-07 01:45:51Z imp $
  */
 
 /***************************************************************************

Modified: trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
===================================================================
--- trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_l2cap_ulpi.c
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_l2cap_ulpi.c,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_l2cap_ulpi.c,v 1.1 2002/11/24 19:47:06 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c 139823 2005-01-07 01:45:51Z imp $
  */
 
 #include <sys/param.h>

Modified: trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
===================================================================
--- trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_l2cap_ulpi.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_l2cap_ulpi.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_l2cap_ulpi.h,v 1.1 2002/11/24 19:47:06 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h 139823 2005-01-07 01:45:51Z imp $
  */
 
 #ifndef _NETGRAPH_L2CAP_ULPI_H_

Modified: trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
===================================================================
--- trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h	2018-05-25 13:15:48 UTC (rev 9930)
+++ trunk/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h	2018-05-25 20:02:41 UTC (rev 9931)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ng_l2cap_var.h
  */
@@ -27,8 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ng_l2cap_var.h,v 1.1.1.3 2012-07-21 15:17:19 laffer1 Exp $
- * $FreeBSD$
+ * $Id: ng_l2cap_var.h,v 1.2 2003/04/28 21:44:59 max Exp $
+ * $FreeBSD: stable/10/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h 139823 2005-01-07 01:45:51Z imp $
  */
 
 #ifndef _NETGRAPH_L2CAP_VAR_H_



More information about the Midnightbsd-cvs mailing list