Module Name: src
Committed By: tls
Date: Sun Aug 10 06:56:36 UTC 2014
Modified Files:
src/sys/netisdn [tls-earlyentropy]: i4b_ctl.c i4b_i4bdrv.c i4b_ipr.c
i4b_rbch.c i4b_tel.c i4b_trace.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.2.1 src/sys/netisdn/i4b_ctl.c
cvs rdiff -u -r1.38 -r1.38.2.1 src/sys/netisdn/i4b_i4bdrv.c
cvs rdiff -u -r1.35 -r1.35.32.1 src/sys/netisdn/i4b_ipr.c
cvs rdiff -u -r1.27 -r1.27.2.1 src/sys/netisdn/i4b_rbch.c
cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/netisdn/i4b_tel.c
cvs rdiff -u -r1.21 -r1.21.2.1 src/sys/netisdn/i4b_trace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netisdn/i4b_ctl.c
diff -u src/sys/netisdn/i4b_ctl.c:1.23 src/sys/netisdn/i4b_ctl.c:1.23.2.1
--- src/sys/netisdn/i4b_ctl.c:1.23 Sun Mar 16 05:20:30 2014
+++ src/sys/netisdn/i4b_ctl.c Sun Aug 10 06:56:36 2014
@@ -27,7 +27,7 @@
* i4b_ctl.c - i4b system control port driver
* ------------------------------------------
*
- * $Id: i4b_ctl.c,v 1.23 2014/03/16 05:20:30 dholland Exp $
+ * $Id: i4b_ctl.c,v 1.23.2.1 2014/08/10 06:56:36 tls Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_ctl.c,v 1.23 2014/03/16 05:20:30 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_ctl.c,v 1.23.2.1 2014/08/10 06:56:36 tls Exp $");
#include "isdnctl.h"
@@ -164,6 +164,7 @@ const struct cdevsw isdnctl_cdevsw = {
.d_poll = nopoll,
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
+ .d_discard = nodiscard,
.d_flag = D_OTHER
};
#endif /* __NetBSD__ */
Index: src/sys/netisdn/i4b_i4bdrv.c
diff -u src/sys/netisdn/i4b_i4bdrv.c:1.38 src/sys/netisdn/i4b_i4bdrv.c:1.38.2.1
--- src/sys/netisdn/i4b_i4bdrv.c:1.38 Sun Mar 16 05:20:30 2014
+++ src/sys/netisdn/i4b_i4bdrv.c Sun Aug 10 06:56:36 2014
@@ -27,7 +27,7 @@
* i4b_i4bdrv.c - i4b userland interface driver
* --------------------------------------------
*
- * $Id: i4b_i4bdrv.c,v 1.38 2014/03/16 05:20:30 dholland Exp $
+ * $Id: i4b_i4bdrv.c,v 1.38.2.1 2014/08/10 06:56:36 tls Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_i4bdrv.c,v 1.38 2014/03/16 05:20:30 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_i4bdrv.c,v 1.38.2.1 2014/08/10 06:56:36 tls Exp $");
#include "isdn.h"
@@ -206,6 +206,7 @@ const struct cdevsw isdn_cdevsw = {
.d_poll = isdnpoll,
.d_mmap = nommap,
.d_kqfilter = isdnkqfilter,
+ .d_discard = nodiscard,
.d_flag = D_OTHER
};
#endif /* __NetBSD__ */
Index: src/sys/netisdn/i4b_ipr.c
diff -u src/sys/netisdn/i4b_ipr.c:1.35 src/sys/netisdn/i4b_ipr.c:1.35.32.1
--- src/sys/netisdn/i4b_ipr.c:1.35 Mon Apr 5 07:22:50 2010
+++ src/sys/netisdn/i4b_ipr.c Sun Aug 10 06:56:36 2014
@@ -27,7 +27,7 @@
* i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
* ---------------------------------------------------------
*
- * $Id: i4b_ipr.c,v 1.35 2010/04/05 07:22:50 joerg Exp $
+ * $Id: i4b_ipr.c,v 1.35.32.1 2014/08/10 06:56:36 tls Exp $
*
* $FreeBSD$
*
@@ -59,7 +59,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.35 2010/04/05 07:22:50 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.35.32.1 2014/08/10 06:56:36 tls Exp $");
#include "irip.h"
#include "opt_irip.h"
@@ -1074,20 +1074,11 @@ error:
}
#endif /* NBPFILTER > 0 || NBPF > 0 */
- if(IF_QFULL(&ipintrq))
- {
- NDBGL4(L4_IPRDBG, "%s: ipintrq full!", sc->sc_if.if_xname);
-
- IF_DROP(&ipintrq);
+ if (__predict_false(!pktq_enqueue(ip_pktq, m, 0))) {
sc->sc_if.if_ierrors++;
sc->sc_if.if_iqdrops++;
m_freem(m);
}
- else
- {
- IF_ENQUEUE(&ipintrq, m);
- schednetisr(NETISR_IP);
- }
}
/*---------------------------------------------------------------------------*
Index: src/sys/netisdn/i4b_rbch.c
diff -u src/sys/netisdn/i4b_rbch.c:1.27 src/sys/netisdn/i4b_rbch.c:1.27.2.1
--- src/sys/netisdn/i4b_rbch.c:1.27 Sun Mar 16 05:20:30 2014
+++ src/sys/netisdn/i4b_rbch.c Sun Aug 10 06:56:36 2014
@@ -27,7 +27,7 @@
* i4b_rbch.c - device driver for raw B channel data
* ---------------------------------------------------
*
- * $Id: i4b_rbch.c,v 1.27 2014/03/16 05:20:30 dholland Exp $
+ * $Id: i4b_rbch.c,v 1.27.2.1 2014/08/10 06:56:36 tls Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_rbch.c,v 1.27 2014/03/16 05:20:30 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_rbch.c,v 1.27.2.1 2014/08/10 06:56:36 tls Exp $");
#include "isdnbchan.h"
@@ -200,6 +200,7 @@ const struct cdevsw isdnbchan_cdevsw = {
.d_poll = isdnbchanpoll,
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
+ .d_discard = nodiscard,
.d_flag = D_OTHER
};
#endif /* __NetBSD__ */
Index: src/sys/netisdn/i4b_tel.c
diff -u src/sys/netisdn/i4b_tel.c:1.26 src/sys/netisdn/i4b_tel.c:1.26.2.1
--- src/sys/netisdn/i4b_tel.c:1.26 Sun Mar 16 05:20:30 2014
+++ src/sys/netisdn/i4b_tel.c Sun Aug 10 06:56:36 2014
@@ -27,7 +27,7 @@
* i4b_tel.c - device driver for ISDN telephony
* --------------------------------------------
*
- * $Id: i4b_tel.c,v 1.26 2014/03/16 05:20:30 dholland Exp $
+ * $Id: i4b_tel.c,v 1.26.2.1 2014/08/10 06:56:36 tls Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_tel.c,v 1.26 2014/03/16 05:20:30 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_tel.c,v 1.26.2.1 2014/08/10 06:56:36 tls Exp $");
#include "isdntel.h"
@@ -204,6 +204,7 @@ const struct cdevsw isdntel_cdevsw = {
.d_poll = isdntelpoll,
.d_mmap = nommap,
.d_kqfilter = isdntelkqfilter,
+ .d_discard = nodiscard,
.d_flag = D_OTHER
};
#endif /* __NetBSD__ */
Index: src/sys/netisdn/i4b_trace.c
diff -u src/sys/netisdn/i4b_trace.c:1.21 src/sys/netisdn/i4b_trace.c:1.21.2.1
--- src/sys/netisdn/i4b_trace.c:1.21 Sun Mar 16 05:20:30 2014
+++ src/sys/netisdn/i4b_trace.c Sun Aug 10 06:56:36 2014
@@ -27,7 +27,7 @@
* i4btrc - device driver for trace data read device
* ---------------------------------------------------
*
- * $Id: i4b_trace.c,v 1.21 2014/03/16 05:20:30 dholland Exp $
+ * $Id: i4b_trace.c,v 1.21.2.1 2014/08/10 06:56:36 tls Exp $
*
* last edit-date: [Fri Jan 5 11:33:47 2001]
*
@@ -35,7 +35,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_trace.c,v 1.21 2014/03/16 05:20:30 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_trace.c,v 1.21.2.1 2014/08/10 06:56:36 tls Exp $");
#include "isdntrc.h"
@@ -99,6 +99,7 @@ const struct cdevsw isdntrc_cdevsw = {
.d_poll = nopoll,
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
+ .d_discard = nodiscard,
.d_flag = D_OTHER
};
#endif /* __NetBSD__ */
