Back out M_* changes, per decision of the TRB.

Approved by: trb

3 files changed, 18 insertions, 18 deletions

diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
index 9bc2438..8fa8a08 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
@@ -275,7 +275,7 @@ ng_btsocket_hci_raw_node_rcvdata(hook_p hook, item_p item)
 	struct mbuf	*nam = NULL;
 	int		 error;
 
-	MGET(nam, M_NOWAIT, MT_SONAME);
+	MGET(nam, M_DONTWAIT, MT_SONAME);
 	if (nam != NULL) {
 		struct sockaddr_hci	*sa = mtod(nam, struct sockaddr_hci *);
 
@@ -348,7 +348,7 @@ ng_btsocket_raw_send_ngmsg(char *path, int cmd, void *arg, int arglen)
 	struct ng_mesg	*msg = NULL;
 	int		 error = 0;
 
-	NG_MKMESSAGE(msg, NGM_HCI_COOKIE, cmd, arglen, 0);
+	NG_MKMESSAGE(msg, NGM_HCI_COOKIE, cmd, arglen, M_WAITOK);
 	if (msg == NULL)
 		return (ENOMEM);
 
@@ -374,7 +374,7 @@ ng_btsocket_raw_send_sync_ngmsg(ng_btsocket_hci_raw_pcb_p pcb, char *path,
 	ng_btsocket_hci_raw_get_token(&pcb->token);
 	pcb->msg = NULL;
 
-	NG_MKMESSAGE(msg, NGM_HCI_COOKIE, cmd, 0, 0);
+	NG_MKMESSAGE(msg, NGM_HCI_COOKIE, cmd, 0, M_WAITOK);
 	if (msg == NULL) {
 		pcb->token = 0;
 		return (ENOMEM);
@@ -504,7 +504,7 @@ ng_btsocket_hci_raw_data_input(struct mbuf *nam)
 		 * will check if socket has enough buffer space.
 		 */
 
-		m = m_dup(m0, M_NOWAIT);
+		m = m_dup(m0, M_DONTWAIT);
 		if (m != NULL) {
 			struct mbuf	*ctl = NULL;
 
@@ -743,7 +743,7 @@ ng_btsocket_hci_raw_attach(struct socket *so, int proto, struct thread *td)
 		return (error);
 
 	MALLOC(pcb, ng_btsocket_hci_raw_pcb_p, sizeof(*pcb), 
-		M_NETGRAPH_BTSOCKET_HCI_RAW, M_ZERO);
+		M_NETGRAPH_BTSOCKET_HCI_RAW, M_WAITOK | M_ZERO);
 	if (pcb == NULL)
 		return (ENOMEM);
 
@@ -956,7 +956,7 @@ ng_btsocket_hci_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_HCI_COOKIE,
-			NGM_HCI_NODE_GET_NEIGHBOR_CACHE, 0, 0);
+			NGM_HCI_NODE_GET_NEIGHBOR_CACHE, 0, M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -1014,7 +1014,7 @@ ng_btsocket_hci_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_HCI_COOKIE, NGM_HCI_NODE_GET_CON_LIST,
-			0, 0);
+			0, M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -1271,7 +1271,7 @@ ng_btsocket_hci_raw_send(struct socket *so, int flags, struct mbuf *m,
 		sa = (struct sockaddr *) &pcb->addr;
 	}
 
-	MGET(nam, 0, MT_SONAME);
+	MGET(nam, M_TRYWAIT, MT_SONAME);
 	if (nam == NULL) {
 		error = ENOBUFS;
 		goto drop;
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
index 8360038..dec7a3c 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -1464,7 +1464,7 @@ ng_btsocket_l2cap_data_input(struct mbuf *m, hook_p hook)
 			 * it is a broadcast traffic after all
 			 */
 
-			copy = m_dup(m, M_NOWAIT);
+			copy = m_dup(m, M_DONTWAIT);
 			if (copy != NULL) {
 				sbappendrecord(&pcb->so->so_rcv, copy);
 				sorwakeup(pcb->so);
@@ -2384,7 +2384,7 @@ ng_btsocket_l2cap_send2(ng_btsocket_l2cap_pcb_p pcb)
 	if (pcb->so->so_snd.sb_cc == 0)
 		return (EINVAL); /* XXX */
 
-	m = m_dup(pcb->so->so_snd.sb_mb, M_NOWAIT);
+	m = m_dup(pcb->so->so_snd.sb_mb, M_DONTWAIT);
 	if (m == NULL)
 		return (ENOBUFS);
 
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
index 44e3be1..3b24afd 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
@@ -571,7 +571,7 @@ ng_btsocket_l2cap_raw_attach(struct socket *so, int proto, struct thread *td)
 
 	/* Allocate the PCB */
         MALLOC(pcb, ng_btsocket_l2cap_raw_pcb_p, sizeof(*pcb),
-		M_NETGRAPH_BTSOCKET_L2CAP_RAW, M_ZERO);
+		M_NETGRAPH_BTSOCKET_L2CAP_RAW, M_WAITOK | M_ZERO);
         if (pcb == NULL)
                 return (ENOMEM);
 
@@ -758,7 +758,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE, NGM_L2CAP_NODE_GET_FLAGS,
-			0, 0);
+			0, M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -799,7 +799,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE, NGM_L2CAP_NODE_GET_DEBUG,
-			0, 0);
+			0, M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -837,7 +837,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 			(struct ng_btsocket_l2cap_raw_node_debug *) data;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE, NGM_L2CAP_NODE_SET_DEBUG,
-			sizeof(ng_l2cap_node_debug_ep), 0);
+			sizeof(ng_l2cap_node_debug_ep), M_WAITOK);
 		if (msg == NULL) {
 			error = ENOMEM;
 			break;
@@ -865,7 +865,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE, NGM_L2CAP_NODE_GET_CON_LIST,
-			0, 0);
+			0, M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -923,7 +923,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE,
-			NGM_L2CAP_NODE_GET_CHAN_LIST, 0, 0);
+			NGM_L2CAP_NODE_GET_CHAN_LIST, 0, M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -987,7 +987,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE,
 			NGM_L2CAP_L2CA_PING, sizeof(*ip) + p->echo_size,
-			0);
+			M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -1056,7 +1056,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE,
 			NGM_L2CAP_L2CA_GET_INFO, sizeof(*ip) + p->info_size,
-			0);
+			M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;