From 66b30f7bd167a371802e8c90f52e5387a225a0d5 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Tue, 21 Nov 2006 17:33:01 -0800 Subject: [PATCH] --- yaml --- r: 41045 b: refs/heads/master c: 700f9672c9a61c12334651a94d17ec04620e1976 h: refs/heads/master i: 41043: feb1817094d33a8c11858ab08ca4a524c106b8fc v: v3 --- [refs] | 2 +- trunk/net/irda/irlmp.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 87b7a29b5ac0..052fc460bfc8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4498c80d9c1ebdf42837be6a52ead35a2aa2b819 +refs/heads/master: 700f9672c9a61c12334651a94d17ec04620e1976 diff --git a/trunk/net/irda/irlmp.c b/trunk/net/irda/irlmp.c index 5073261b9d0c..fede83763095 100644 --- a/trunk/net/irda/irlmp.c +++ b/trunk/net/irda/irlmp.c @@ -1678,7 +1678,8 @@ static int irlmp_slsap_inuse(__u8 slsap_sel) * every IrLAP connection and check every LSAP associated with each * the connection. */ - spin_lock_irqsave(&irlmp->links->hb_spinlock, flags); + spin_lock_irqsave_nested(&irlmp->links->hb_spinlock, flags, + SINGLE_DEPTH_NESTING); lap = (struct lap_cb *) hashbin_get_first(irlmp->links); while (lap != NULL) { IRDA_ASSERT(lap->magic == LMP_LAP_MAGIC, goto errlap;);