From 62766c3384174ec96b911af9814707da74d21483 Mon Sep 17 00:00:00 2001 From: Jaikumar Ganesh Date: Mon, 2 Feb 2009 18:03:57 -0800 Subject: [PATCH] --- yaml --- r: 134726 b: refs/heads/master c: 6e1031a40029492c10509e8c3dcac9b611438ccb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bluetooth/rfcomm/core.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 478a7cd192bf..15215a1fc78d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34a55eda483e8177c9044f93fd2c9107f02bf1c7 +refs/heads/master: 6e1031a40029492c10509e8c3dcac9b611438ccb diff --git a/trunk/net/bluetooth/rfcomm/core.c b/trunk/net/bluetooth/rfcomm/core.c index ad0e25a21832..3717c25ba33a 100644 --- a/trunk/net/bluetooth/rfcomm/core.c +++ b/trunk/net/bluetooth/rfcomm/core.c @@ -1749,6 +1749,9 @@ static inline void rfcomm_process_dlcs(struct rfcomm_session *s) continue; } + if (test_bit(RFCOMM_SEC_PENDING, &d->flags)) + continue; + if (test_bit(RFCOMM_TX_THROTTLED, &s->flags)) continue;