Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752719AbaFFKTr (ORCPT ); Fri, 6 Jun 2014 06:19:47 -0400 Received: from mail-ie0-f182.google.com ([209.85.223.182]:35006 "EHLO mail-ie0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752212AbaFFKTp (ORCPT ); Fri, 6 Jun 2014 06:19:45 -0400 From: Kiran Kumar Raparthy To: linux-kernel@vger.kernel.org Cc: Nick Pelly , Marcel Holtmann , Gustavo Padovan , Johan Hedberg , "David S. Miller" , Peter Hurley , Seung-Woo Kim , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, Android Kernel Team , John Stultz , Kiran Raparthy Subject: [RFC] Bluetooth: Do not attempt to send dlci disconnect when in BT_CONFIG. Date: Fri, 6 Jun 2014 15:49:31 +0530 Message-Id: <1402049971-7762-1-git-send-email-kiran.kumar@linaro.org> X-Mailer: git-send-email 1.8.2.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nick Pelly Do not attempt to send dlci disconnect when in BT_CONFIG. This fixes a bug where shutdown() and close() on a rfcomm socket during ACL connection would not cause HCI Create Connection Cancel. This is one of the number of patches from the Android AOSP common.git tree, which is used on almost all Android devices. so I wanted to submit it for review to see if it should go upstream. Cc: Marcel Holtmann Cc: Gustavo Padovan Cc: Johan Hedberg Cc: David S. Miller Cc: Peter Hurley Cc: Seung-Woo Kim Cc: Nick Pelly Cc: linux-bluetooth@vger.kernel.org Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Android Kernel Team Cc: John Stultz Signed-off-by: Nick Pelly [kiran: Added context to commit message] Signed-off-by: Kiran Raparthy --- net/bluetooth/rfcomm/core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index cf62026..6a531e7 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -456,7 +456,6 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err) switch (d->state) { case BT_CONNECT: - case BT_CONFIG: case BT_OPEN: case BT_CONNECT2: if (test_and_clear_bit(RFCOMM_DEFER_SETUP, &d->flags)) { -- 1.8.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/