[Midnightbsd-cvs] src [9935] trunk/sys/netgraph/atm: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri May 25 16:03:53 EDT 2018
Revision: 9935
http://svnweb.midnightbsd.org/src/?rev=9935
Author: laffer1
Date: 2018-05-25 16:03:52 -0400 (Fri, 25 May 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/sys/netgraph/atm/ng_atm.c
trunk/sys/netgraph/atm/ng_atm.h
trunk/sys/netgraph/atm/ng_ccatm.h
trunk/sys/netgraph/atm/ng_sscfu.h
trunk/sys/netgraph/atm/ng_sscop.h
trunk/sys/netgraph/atm/ng_uni.h
trunk/sys/netgraph/atm/ngatmbase.c
trunk/sys/netgraph/atm/ngatmbase.h
trunk/sys/netgraph/atm/sscop/ng_sscop.c
trunk/sys/netgraph/atm/sscop/ng_sscop_cust.h
trunk/sys/netgraph/atm/uni/ng_uni.c
trunk/sys/netgraph/atm/uni/ng_uni_cust.h
Modified: trunk/sys/netgraph/atm/ng_atm.c
===================================================================
--- trunk/sys/netgraph/atm/ng_atm.c 2018-05-25 20:03:35 UTC (rev 9934)
+++ trunk/sys/netgraph/atm/ng_atm.c 2018-05-25 20:03:52 UTC (rev 9935)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -32,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/netgraph/atm/ng_atm.c 243882 2012-12-05 08:04:20Z glebius $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -384,7 +385,7 @@
/*
* Prepend the atm_pseudoheader.
*/
- M_PREPEND(*mp, sizeof(*ah), M_DONTWAIT);
+ M_PREPEND(*mp, sizeof(*ah), M_NOWAIT);
if (*mp == NULL)
return;
memcpy(mtod(*mp, struct atm_pseudohdr *), ah, sizeof(*ah));
@@ -462,7 +463,7 @@
/*
* Prepend the atm_pseudoheader.
*/
- M_PREPEND(m, sizeof(*ah), M_DONTWAIT);
+ M_PREPEND(m, sizeof(*ah), M_NOWAIT);
if (m == NULL)
return;
memcpy(mtod(m, struct atm_pseudohdr *), ah, sizeof(*ah));
@@ -502,7 +503,7 @@
/*
* Prepend pseudo-hdr. Drivers don't care about the flags.
*/
- M_PREPEND(m, sizeof(*aph), M_DONTWAIT);
+ M_PREPEND(m, sizeof(*aph), M_NOWAIT);
if (m == NULL) {
NG_FREE_M(m);
return (ENOMEM);
Modified: trunk/sys/netgraph/atm/ng_atm.h
===================================================================
--- trunk/sys/netgraph/atm/ng_atm.h 2018-05-25 20:03:35 UTC (rev 9934)
+++ trunk/sys/netgraph/atm/ng_atm.h 2018-05-25 20:03:52 UTC (rev 9935)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -30,7 +31,7 @@
/*
* Netgraph module to connect NATM interfaces to netgraph.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/netgraph/atm/ng_atm.h 139823 2005-01-07 01:45:51Z imp $
*/
#ifndef _NETGRAPH_ATM_NG_ATM_H_
#define _NETGRAPH_ATM_NG_ATM_H_
Modified: trunk/sys/netgraph/atm/ng_ccatm.h
===================================================================
--- trunk/sys/netgraph/atm/ng_ccatm.h 2018-05-25 20:03:35 UTC (rev 9934)
+++ trunk/sys/netgraph/atm/ng_ccatm.h 2018-05-25 20:03:52 UTC (rev 9935)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2002
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -30,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/netgraph/atm/ng_ccatm.h 189315 2009-03-03 18:47:33Z ed $
*/
/*
Modified: trunk/sys/netgraph/atm/ng_sscfu.h
===================================================================
--- trunk/sys/netgraph/atm/ng_sscfu.h 2018-05-25 20:03:35 UTC (rev 9934)
+++ trunk/sys/netgraph/atm/ng_sscfu.h 2018-05-25 20:03:52 UTC (rev 9935)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/netgraph/atm/ng_sscfu.h 139823 2005-01-07 01:45:51Z imp $
*
* Netgraph module for ITU-T Q.2120 UNI SSCF.
*/
Modified: trunk/sys/netgraph/atm/ng_sscop.h
===================================================================
--- trunk/sys/netgraph/atm/ng_sscop.h 2018-05-25 20:03:35 UTC (rev 9934)
+++ trunk/sys/netgraph/atm/ng_sscop.h 2018-05-25 20:03:52 UTC (rev 9935)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/netgraph/atm/ng_sscop.h 139823 2005-01-07 01:45:51Z imp $
*
* Netgraph module for Q.2110 SSCOP
*/
Modified: trunk/sys/netgraph/atm/ng_uni.h
===================================================================
--- trunk/sys/netgraph/atm/ng_uni.h 2018-05-25 20:03:35 UTC (rev 9934)
+++ trunk/sys/netgraph/atm/ng_uni.h 2018-05-25 20:03:52 UTC (rev 9935)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/netgraph/atm/ng_uni.h 139823 2005-01-07 01:45:51Z imp $
*
* Netgraph module for UNI 4.0
*/
Modified: trunk/sys/netgraph/atm/ngatmbase.c
===================================================================
--- trunk/sys/netgraph/atm/ngatmbase.c 2018-05-25 20:03:35 UTC (rev 9934)
+++ trunk/sys/netgraph/atm/ngatmbase.c 2018-05-25 20:03:52 UTC (rev 9935)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/netgraph/atm/ngatmbase.c 241394 2012-10-10 08:36:38Z kevlo $");
#include <sys/param.h>
#include <sys/module.h>
Modified: trunk/sys/netgraph/atm/ngatmbase.h
===================================================================
--- trunk/sys/netgraph/atm/ngatmbase.h 2018-05-25 20:03:35 UTC (rev 9934)
+++ trunk/sys/netgraph/atm/ngatmbase.h 2018-05-25 20:03:52 UTC (rev 9935)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -27,7 +28,7 @@
* 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/ngatmbase.h 139823 2005-01-07 01:45:51Z imp $
*
* In-kernel UNI stack message functions.
*/
Modified: trunk/sys/netgraph/atm/sscop/ng_sscop.c
===================================================================
--- trunk/sys/netgraph/atm/sscop/ng_sscop.c 2018-05-25 20:03:35 UTC (rev 9934)
+++ trunk/sys/netgraph/atm/sscop/ng_sscop.c 2018-05-25 20:03:52 UTC (rev 9935)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/netgraph/atm/sscop/ng_sscop.c 241686 2012-10-18 13:57:24Z andre $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -861,10 +862,8 @@
static int
ng_sscop_mod_event(module_t mod, int event, void *data)
{
- int s;
int error = 0;
- s = splnet();
switch (event) {
case MOD_LOAD:
@@ -877,6 +876,5 @@
error = EOPNOTSUPP;
break;
}
- splx(s);
return (error);
}
Modified: trunk/sys/netgraph/atm/sscop/ng_sscop_cust.h
===================================================================
--- trunk/sys/netgraph/atm/sscop/ng_sscop_cust.h 2018-05-25 20:03:35 UTC (rev 9934)
+++ trunk/sys/netgraph/atm/sscop/ng_sscop_cust.h 2018-05-25 20:03:52 UTC (rev 9935)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/netgraph/atm/sscop/ng_sscop_cust.h 281657 2015-04-17 15:39:42Z rrs $
*
* Customisation of the SSCOP code to ng_sscop.
*/
@@ -115,7 +116,7 @@
ng_callout(&(S)->t_##T, (S)->aarg, NULL, \
hz * (S)->timer##T / 1000, T##_func, (S), 0); \
} while (0)
-#define TIMER_ISACT(S, T) ((S)->t_##T.c_flags & (CALLOUT_PENDING))
+#define TIMER_ISACT(S, T) (callout_pending(&(S)->t_##T))
/*
* This assumes, that the user argument is the node pointer.
Modified: trunk/sys/netgraph/atm/uni/ng_uni.c
===================================================================
--- trunk/sys/netgraph/atm/uni/ng_uni.c 2018-05-25 20:03:35 UTC (rev 9934)
+++ trunk/sys/netgraph/atm/uni/ng_uni.c 2018-05-25 20:03:52 UTC (rev 9935)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/netgraph/atm/uni/ng_uni.c 241686 2012-10-18 13:57:24Z andre $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -907,10 +908,8 @@
static int
ng_uni_mod_event(module_t mod, int event, void *data)
{
- int s;
int error = 0;
- s = splnet();
switch(event) {
case MOD_LOAD:
@@ -925,6 +924,5 @@
error = EOPNOTSUPP;
break;
}
- splx(s);
return (error);
}
Modified: trunk/sys/netgraph/atm/uni/ng_uni_cust.h
===================================================================
--- trunk/sys/netgraph/atm/uni/ng_uni_cust.h 2018-05-25 20:03:35 UTC (rev 9934)
+++ trunk/sys/netgraph/atm/uni/ng_uni_cust.h 2018-05-25 20:03:52 UTC (rev 9935)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -28,7 +29,7 @@
*
* Customisation of signalling source to the NG environment.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/netgraph/atm/uni/ng_uni_cust.h 281657 2015-04-17 15:39:42Z rrs $
*/
#include <sys/param.h>
@@ -87,8 +88,8 @@
#define _TIMER_STOP(UNI,FIELD) do { \
ng_uncallout(&FIELD.c, (UNI)->arg); \
} while (0)
-#define TIMER_ISACT(UNI,T) ((UNI)->T.c.c_flags & (CALLOUT_ACTIVE | \
- CALLOUT_PENDING))
+#define TIMER_ISACT(UNI,T) (callout_active(&(UNI)->T.c) || \
+ callout_pending(&(UNI)->T.c))
#define _TIMER_START(UNI,ARG,FIELD,DUE,FUNC) do { \
_TIMER_STOP(UNI, FIELD); \
ng_callout(&FIELD.c, (UNI)->arg, NULL, \
More information about the Midnightbsd-cvs
mailing list