summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2009-02-02 18:03:57 -0800
committerNick Pelly <npelly@google.com>2009-04-06 17:39:28 -0700
commite7f60c444541cf27745a6f3ddd5d90f972b07ef4 (patch)
tree956b788db201d0b54ca54cc5e811de0060256a55 /net
parentaac0e68187f7bdb3fe07da16365dd483ceb5d05b (diff)
Bluetooth: When encryption is dropped, do not send RFCOMM packets
During a role change with pre-Bluetooth 2.1 devices, the remote side drops the encryption of the RFCOMM connection. We allow a grace period for the encryption to be re-established, before dropping the connection. During this grace period, the RFCOMM_SEC_PENDING flag is set. Check this flag before sending RFCOMM packets. Signed-off-by: Jaikumar Ganesh <jaikumar@google.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/rfcomm/core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index ad0e25a21832..3717c25ba33a 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/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;