summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Jenkins <Dean_Jenkins@mentor.com>2013-02-28 15:21:57 +0100
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-03-08 14:40:25 +0100
commit8e888f2783384ec097bc0c88d9949776f3584ed3 (patch)
tree3d4adb6931dd862e8a8a9eb343b02b60e3a605af
parentBluetooth: Remove RFCOMM session refcnt (diff)
downloadlinux-8e888f2783384ec097bc0c88d9949776f3584ed3.tar.xz
linux-8e888f2783384ec097bc0c88d9949776f3584ed3.zip
Bluetooth: Remove redundant call to rfcomm_send_disc
In rfcomm_session_del() remove the redundant call to rfcomm_send_disc() because it is not possible for the session to be in BT_CONNECTED state during deletion of the session. Signed-off-by: Dean Jenkins <Dean_Jenkins@mentor.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-rw-r--r--net/bluetooth/rfcomm/core.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 75b7bbd8acb7..c7e88761d3b7 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -627,9 +627,6 @@ static struct rfcomm_session *rfcomm_session_del(struct rfcomm_session *s)
list_del(&s->list);
- if (state == BT_CONNECTED)
- rfcomm_send_disc(s, 0);
-
rfcomm_session_clear_timer(s);
sock_release(s->sock);
kfree(s);