From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80CDFC76196 for ; Tue, 28 Mar 2023 15:00:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233703AbjC1PA2 (ORCPT ); Tue, 28 Mar 2023 11:00:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233674AbjC1PA1 (ORCPT ); Tue, 28 Mar 2023 11:00:27 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDE25E392 for ; Tue, 28 Mar 2023 08:00:26 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 92DE9B81D68 for ; Tue, 28 Mar 2023 15:00:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5335C433EF; Tue, 28 Mar 2023 15:00:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1680015624; bh=VPK43WTU3u1Y+HzGZcYVPGCanzSOJSkJMhKfBtCLQoM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RjsrZaZ4hEB+cFoWN4K+enlVZKS5wavgCtiC4ySgbp4hLuK+SFjN6dLHkSpPMmTrK zzeOqUiJb2yBFpi1ze3yT9mxiPWv2XSO3aXfj7bphVSTaDweJOhKsnklXRlIhTyePF r872R6D9TgcK+QdIVUEEHBeQj3/qae8+fpW5ZPh0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Brian Gix , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.1 084/224] Bluetooth: Remove "Power-on" check from Mesh feature Date: Tue, 28 Mar 2023 16:41:20 +0200 Message-Id: <20230328142620.768463984@linuxfoundation.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230328142617.205414124@linuxfoundation.org> References: <20230328142617.205414124@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Brian Gix [ Upstream commit 52dd5e964a55c98c1b0bcf5fc737a5ddd00e7d4d ] The Bluetooth mesh experimental feature enable was requiring the controller to be powered off in order for the Enable to work. Mesh is supposed to be enablable regardless of the controller state, and created an unintended requirement that the mesh daemon be started before the classic bluetoothd daemon. Fixes: af6bcc1921ff ("Bluetooth: Add experimental wrapper for MGMT based mesh") Signed-off-by: Brian Gix Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- net/bluetooth/mgmt.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 0dd30a3beb776..7576db8eb83e2 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -4627,12 +4627,6 @@ static int set_mgmt_mesh_func(struct sock *sk, struct hci_dev *hdev, MGMT_OP_SET_EXP_FEATURE, MGMT_STATUS_INVALID_INDEX); - /* Changes can only be made when controller is powered down */ - if (hdev_is_powered(hdev)) - return mgmt_cmd_status(sk, hdev->id, - MGMT_OP_SET_EXP_FEATURE, - MGMT_STATUS_REJECTED); - /* Parameters are limited to a single octet */ if (data_len != MGMT_SET_EXP_FEATURE_SIZE + 1) return mgmt_cmd_status(sk, hdev->id, -- 2.39.2