From b7b65ef4d0fa17652b183e415ffaac3e8e696051 Mon Sep 17 00:00:00 2001 From: Arkadiusz Lichwa Date: Thu, 6 Oct 2016 14:41:58 +0200 Subject: [PATCH] Bluetooth: L2CAP: Cleanup l2cap_br_conn_req() Removes the code responsible for reset channel object internals. These internals will be reset automatically on chan 'destroy' ops as a result of disconnection that taking place in this case. Change-Id: I7bb3aaf225797a7c4b17ed2b578f6825114307c9 Signed-off-by: Arkadiusz Lichwa --- net/bluetooth/l2cap_br.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/bluetooth/l2cap_br.c b/net/bluetooth/l2cap_br.c index 099016a9142..e99d0e9cd96 100644 --- a/net/bluetooth/l2cap_br.c +++ b/net/bluetooth/l2cap_br.c @@ -892,8 +892,6 @@ done: /* Disconnect link when security rules were violated */ if (result == BT_L2CAP_BR_ERR_SEC_BLOCK) { - l2cap_br_state_set(chan, BT_L2CAP_DISCONNECTED); - atomic_clear(BR_CHAN(chan)->flags); bt_conn_disconnect(conn, BT_HCI_ERR_AUTHENTICATION_FAIL); return; }