From patchwork Mon Jan 8 18:39:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jonas_Dre=C3=9Fler?= X-Patchwork-Id: 186099 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp1205733dyq; Mon, 8 Jan 2024 10:40:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IE/BM0K/Rgq1ZPz+ocQBLpzoS1kluF+cYY5TTvCDHvII0QiUtqU7Zsjf89Rn1qKvFkfkYXS X-Received: by 2002:a17:906:fd58:b0:a29:f55d:e1a6 with SMTP id wi24-20020a170906fd5800b00a29f55de1a6mr926009ejb.105.1704739250772; Mon, 08 Jan 2024 10:40:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704739250; cv=none; d=google.com; s=arc-20160816; b=VkFh49mGzRB0frTzOPfWZAUuDaiAFiIxY39P0Cqan49dLOKGF9spjueafkTsy9Zaim DyOT1ybNy7NyvaR7J1Rj22TbgoqY3Iw/AcxaRjfOLvgnlw7rzOU749O4o+pj0daqZ5E8 bAPKvVN7wKDsC0oGaml1ZOfWtUUiuGxDRtZgtMueXNeQsZR/hsdVfkVNcoHIKcbf9yiR orV7ZMQw8pDgzIAMfnITZ3WjyPWkmuEt7FiuOycD/DEKQ0w9Tls7Kxyc8U3sm0tSgu1q Tpm5r1xfSdyKK0rIH/v+eiW9HiazxwNH08gZHN9ltRgbHeqELUW/8gqeDHnRfGDHOaoP RLGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=xUma43kwZXZ3kaXxzh75NrAnJAEsoLfFHHwqL86ZjQ0=; fh=3AqDzvZy8BuFcn015+g5AB3sGQnZc/edyFwniXfpO+U=; b=RJM6oxIX8s8N9Q8fC38Q65WynZBbR0MRYYFRuI0NcHQaAwCm/lK65JnnI/xvWOk1kU H0BKkhLQICgQyCtXSNPrL77k06L32B7EhqQTyveOdJhVnnGBchFkBI5rlu3kr1c85MWs Us3xbAHNY8Uzrem6w8wBMB28uVa/RMZE39eJbVUgPMLY0h9GyQEr1cMOFyKIszZZQook SbJjjKIQlm4m7g+/wS7FceuaAKkgLXjw7pUArO2ikJ2/7yrlTX5uVcxDnSO75r+62L/s GrTUBMH2ouCItXzbure16gqnNZAF5BscuRT6bKaN7QgUhzYOfA//vQHe2xADp24dcYzW W+Jw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-19981-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-19981-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id l9-20020a170906230900b00a293cec0a07si127309eja.160.2024.01.08.10.40.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 10:40:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-19981-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-19981-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-19981-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 638EA1F23CCE for ; Mon, 8 Jan 2024 18:40:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D696E55C11; Mon, 8 Jan 2024 18:39:58 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1674C54FB5; Mon, 8 Jan 2024 18:39:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=v0yd.nl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=v0yd.nl Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4T82sr74KQz9sss; Mon, 8 Jan 2024 19:39:44 +0100 (CET) From: =?utf-8?q?Jonas_Dre=C3=9Fler?= To: Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz Cc: =?utf-8?q?Jonas_Dre=C3=9Fler?= , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2 1/4] Bluetooth: Remove superfluous call to hci_conn_check_pending() Date: Mon, 8 Jan 2024 19:39:33 +0100 Message-ID: <20240108183938.468426-2-verdre@v0yd.nl> In-Reply-To: <20240108183938.468426-1-verdre@v0yd.nl> References: <20240108183938.468426-1-verdre@v0yd.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787548664925607515 X-GMAIL-MSGID: 1787548664925607515 The "pending connections" feature was originally introduced with commit 4c67bc74f016 ("[Bluetooth] Support concurrent connect requests") and 6bd57416127e ("[Bluetooth] Handling pending connect attempts after inquiry") to handle controllers supporting only a single connection request at a time. Later things were extended to also cancel ongoing inquiries on connect() with commit 89e65975fea5 ("Bluetooth: Cancel Inquiry before Create Connection"). With commit a9de9248064b ("[Bluetooth] Switch from OGF+OCF to using only opcodes"), hci_conn_check_pending() was introduced as a helper to consolidate a few places where we check for pending connections (indicated by the BT_CONNECT2 flag) and then try to connect. This refactoring commit also snuck in two more calls to hci_conn_check_pending(): - One is in the failure callback of hci_cs_inquiry(), this one probably makes sense: If we send an "HCI Inquiry" command and then immediately after a "Create Connection" command, the "Create Connection" command might fail before the "HCI Inquiry" command, and then we want to retry the "Create Connection" on failure of the "HCI Inquiry". - The other added call to hci_conn_check_pending() is in the event handler for the "Remote Name" event, this seems unrelated and is possibly a copy-paste error, so remove that one. Fixes: a9de9248064b ("[Bluetooth] Switch from OGF+OCF to using only opcodes") Signed-off-by: Jonas Dreßler --- net/bluetooth/hci_event.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 31ca320ce..13396329f 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3538,8 +3538,6 @@ static void hci_remote_name_evt(struct hci_dev *hdev, void *data, bt_dev_dbg(hdev, "status 0x%2.2x", ev->status); - hci_conn_check_pending(hdev); - hci_dev_lock(hdev); conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);