Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src/sys/net Pull up following revision(s) (requested by knaka...
details: https://anonhg.NetBSD.org/src/rev/f0de80846afb
branches: netbsd-8
changeset: 447448:f0de80846afb
user: martin <martin%NetBSD.org@localhost>
date: Fri Jan 11 15:55:01 2019 +0000
description:
Pull up following revision(s) (requested by knakahara in ticket #1162):
sys/net/if_ppp.c: revision 1.162
sys/net/if_ppp.c: revision 1.163
Fix missing mutex_exit in ppp_create().
Fix missing splx in ppp_inproc().
diffstat:
sys/net/if_ppp.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diffs (42 lines):
diff -r 42d2c7094816 -r f0de80846afb sys/net/if_ppp.c
--- a/sys/net/if_ppp.c Fri Jan 11 15:52:24 2019 +0000
+++ b/sys/net/if_ppp.c Fri Jan 11 15:55:01 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.158.8.1 2018/07/26 23:55:31 snj Exp $ */
+/* $NetBSD: if_ppp.c,v 1.158.8.2 2019/01/11 15:55:01 martin Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.158.8.1 2018/07/26 23:55:31 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.158.8.2 2019/01/11 15:55:01 martin Exp $");
#ifdef _KERNEL_OPT
#include "ppp.h"
@@ -301,6 +301,7 @@
break;
else if (unit == sci->sc_unit) {
free(sc, M_DEVBUF);
+ mutex_exit(&ppp_list_lock);
return NULL;
}
}
@@ -1722,6 +1723,7 @@
/* pktq: inet or inet6 cases */
if (__predict_true(pktq)) {
if (__predict_false(!pktq_enqueue(pktq, m, 0))) {
+ splx(s);
ifp->if_iqdrops++;
goto bad;
}
@@ -1733,6 +1735,7 @@
/* ifq: other protocol cases */
if (!inq) {
+ splx(s);
goto bad;
}
if (IF_QFULL(inq)) {
Home |
Main Index |
Thread Index |
Old Index