[Midnightbsd-cvs] src [9934] trunk/sys/netgraph/atm/ccatm: sync with freebsd

[laffer1 at midnightbsd.org]

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

Modified Paths:
--------------
    trunk/sys/netgraph/atm/ccatm/ng_ccatm.c
    trunk/sys/netgraph/atm/ccatm/ng_ccatm_cust.h

Modified: trunk/sys/netgraph/atm/ccatm/ng_ccatm.c
===================================================================
--- trunk/sys/netgraph/atm/ccatm/ng_ccatm.c	2018-05-25 20:03:22 UTC (rev 9933)
+++ trunk/sys/netgraph/atm/ccatm/ng_ccatm.c	2018-05-25 20:03:35 UTC (rev 9934)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2001-2002
  *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -30,13 +31,13 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/netgraph/atm/ccatm/ng_ccatm.c 243882 2012-12-05 08:04:20Z glebius $
  *
  * ATM call control and API
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/netgraph/atm/ccatm/ng_ccatm.c 243882 2012-12-05 08:04:20Z glebius $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -434,13 +435,13 @@
 	struct ccnode *priv = uarg;
 
 	if (priv->dump == NULL) {
-		m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+		m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (m == NULL)
 			return (ENOBUFS);
 		priv->dump_first = priv->dump_last = m;
 		m->m_pkthdr.len = 0;
 	} else {
-		m = m_getcl(M_DONTWAIT, MT_DATA, 0);
+		m = m_getcl(M_NOWAIT, MT_DATA, 0);
 		if (m == 0) {
 			m_freem(priv->dump_first);
 			return (ENOBUFS);
@@ -1178,10 +1179,8 @@
 static int
 ng_ccatm_mod_event(module_t mod, int event, void *data)
 {
-	int s;
 	int error = 0;
 
-	s = splnet();
 	switch (event) {
 
 	  case MOD_LOAD:
@@ -1194,6 +1193,5 @@
 		error = EOPNOTSUPP;
 		break;
 	}
-	splx(s);
 	return (error);
 }

Modified: trunk/sys/netgraph/atm/ccatm/ng_ccatm_cust.h
===================================================================
--- trunk/sys/netgraph/atm/ccatm/ng_ccatm_cust.h	2018-05-25 20:03:22 UTC (rev 9933)
+++ trunk/sys/netgraph/atm/ccatm/ng_ccatm_cust.h	2018-05-25 20:03:35 UTC (rev 9934)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2003-2004
  *	Hartmut Brandt
@@ -28,7 +29,7 @@
  *
  * Customisation of call control source to the NG environment.
  *
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/netgraph/atm/ccatm/ng_ccatm_cust.h 139823 2005-01-07 01:45:51Z imp $
  */
 
 #include <sys/param.h>