Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/sys/netbt Pull up following revision(s) (requested by plu...
details: https://anonhg.NetBSD.org/src/rev/ee2ab8abe0e2
branches: netbsd-7
changeset: 798603:ee2ab8abe0e2
user: snj <snj%NetBSD.org@localhost>
date: Tue Nov 18 18:45:30 2014 +0000
description:
Pull up following revision(s) (requested by plunky in ticket #248):
sys/netbt/rfcomm_upper.c: revision 1.22
since rfcomm_attach_pcb may be called from (soft) interrupt context
(for incoming connections), use kmem_intr_()
diffstat:
sys/netbt/rfcomm_upper.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diffs (38 lines):
diff -r 264b29417149 -r ee2ab8abe0e2 sys/netbt/rfcomm_upper.c
--- a/sys/netbt/rfcomm_upper.c Tue Nov 18 18:42:42 2014 +0000
+++ b/sys/netbt/rfcomm_upper.c Tue Nov 18 18:45:30 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rfcomm_upper.c,v 1.21 2014/08/08 03:05:45 rtr Exp $ */
+/* $NetBSD: rfcomm_upper.c,v 1.21.2.1 2014/11/18 18:45:30 snj Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rfcomm_upper.c,v 1.21 2014/08/08 03:05:45 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rfcomm_upper.c,v 1.21.2.1 2014/11/18 18:45:30 snj Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -70,7 +70,9 @@
KASSERT(proto != NULL);
KASSERT(upper != NULL);
- dlc = kmem_zalloc(sizeof(struct rfcomm_dlc), KM_SLEEP);
+ dlc = kmem_intr_zalloc(sizeof(struct rfcomm_dlc), KM_NOSLEEP);
+ if (dlc == NULL)
+ return ENOMEM;
dlc->rd_state = RFCOMM_DLC_CLOSED;
dlc->rd_mtu = rfcomm_mtu_default;
@@ -296,7 +298,7 @@
dlc->rd_flags |= RFCOMM_DLC_DETACH;
else {
callout_destroy(&dlc->rd_timeout);
- kmem_free(dlc, sizeof(*dlc));
+ kmem_intr_free(dlc, sizeof(*dlc));
}
}
Home |
Main Index |
Thread Index |
Old Index