Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
From:   Iulia Tanasescu <iulia.tanasescu@nxp.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com,
        silviu.barbulescu@nxp.com, vlad.pruteanu@nxp.com,
        andrei.istodorescu@nxp.com, luiz.dentz@gmail.com,
        Iulia Tanasescu <iulia.tanasescu@nxp.com>
Subject: [PATCH 1/1] Bluetooth: ISO: Match QoS adv handle with BIG handle
Date:   Fri, 29 Sep 2023 18:37:27 +0300
Message-Id: <20230929153727.3728-2-iulia.tanasescu@nxp.com>
In-Reply-To: <20230929153727.3728-1-iulia.tanasescu@nxp.com>
References: <20230929153727.3728-1-iulia.tanasescu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8w9ykzYEi8dcMrxOfWjdMOr2VjDeHCX2BvidonB7aLkuQIe1wxTwH09iQO8+?=
 =?us-ascii?Q?yZcuWYAF741oLJgYhMLTGybHRjr9s4oo1c992t8ITjKnfKRvDFt7tabMsmQW?=
 =?us-ascii?Q?8uZFm8oxRClGCPVBTPepxtsY4/H5sRzF2p08wL8zExVqJL5QnaY18JVeneIf?=
 =?us-ascii?Q?iMvRbOWiVzGy0XxIpoS3/Yig1BxC8gVkIaKMSme1z9he81DEnT6zCa6jjdih?=
 =?us-ascii?Q?P5RXtOp6HksCPZi6yY3DaA1NSfpsVp0dt0LEFFCBpa/m9qhFffk0a4YDs1Fj?=
 =?us-ascii?Q?HthxokwvO8FAaObESRypmpeZJBxrATCxnx8D+HAhj8XQsUw38hP3XHkfCWRe?=
 =?us-ascii?Q?esvyiP1vSwl2ycjAGC8v4lE84ixfa+Hd6E24TmqboW74L8ljFyfYqUy60mmt?=
 =?us-ascii?Q?govhDT2nyMllO0dFcmyzOMVOftSwGGNOcmPo7T2pohmIM9mAPecwmdVstI2Z?=
 =?us-ascii?Q?zpdSyLO1/bGE1V199Sx5ZeHxRvMjUlTnLHjMxR8FzsDEGnNDK/3hQO4nJjWg?=
 =?us-ascii?Q?RWnD+bnKCWk+9pIGQa9hWjaeijvfuOV9yYOyeuWTnGMTew0AcMAmSMKmWutX?=
 =?us-ascii?Q?EPNa8j1sQu4u/cz5jATuOzP0Y7/6xbm76ry3phZuNR/L94sWbziyR/71qIeF?=
 =?us-ascii?Q?5c73P6UQi9LGyyyAhI6vxr4SLMfXt2mNxENpA5kJrtMpGCPLyMlhABI28kDu?=
 =?us-ascii?Q?IDqWwt7+nd1q2xpb++JVJLSnjOTSMUUAfKh/6zhlZ3bZY0EtN2UVIJoptVxO?=
 =?us-ascii?Q?AqkZLxdvzj6BbdV7CCDfGRKK92DIz1ysWhcDGRJFjdXPDbRFLgyJW1cIvnzm?=
 =?us-ascii?Q?ctASDrMqmW/pHSyfcBf/NPzqpzyMvmRfNAHwoPQW4FzGP2uHVHXX1+P0qGdu?=
 =?us-ascii?Q?4fRNbHV73WCZ0/TqNYvqjuVXFM7z0A+oVEAgoirfHgPlvlFvyC5s3Q0xy8vE?=
 =?us-ascii?Q?TZiS0HXuyF/6FfGqlG8V9sMXtcV0O4lTdDkWKuiZSGZsmhSyZiTuqOSu4M9l?=
 =?us-ascii?Q?1DGvHHf/rxjXzeakZ6Y68OFk4jmtgtUihY1j+7DaDpGTgZ776+3rT7GO0Lgq?=
 =?us-ascii?Q?LEQeZo9XoJMphKGIEWqYZiy2cjTpGSrw1AZSwGsSsalGP2KyAdczIeT3Ira1?=
 =?us-ascii?Q?OIHw4CVRrgAOrx7gn5p7iVwdMBacUbiICKC1larqhUdUbidO9fbGbTtc7506?=
 =?us-ascii?Q?PFgkyMKq5R4WE/jKwkQM/mMGWnIogDQHoWzqI2h92m5stQHK+8uqmplKGCWb?=
 =?us-ascii?Q?/7duI0y3Khr0AHAcToSlk4LO04X2C+sNgl4GwR6I/YlnZjhgH10MoUmY2TLO?=
 =?us-ascii?Q?xb9Pqdscw1Y4v8xA2mBej7YRCKvebC+rl2vNwOumfLCl7LFNbdFlyS6BlkD9?=
 =?us-ascii?Q?Renqm/Y8/X31wzvqIma7v/FNgVguNfpzU8VL0TTnZqsXe68IBkkpO4L0RsMS?=
 =?us-ascii?Q?19/Xtn6YTTnlwO9IWl8fM2aB2QGuexd+B6tdW4AX1OFaofHhvhrt508c2ak4?=
 =?us-ascii?Q?5+8usaiX38vfC509ErQasu1orSMbXR23XmuZ//Zj0yhCIooyGw/qaDT3HQke?=
 =?us-ascii?Q?/1SAvu/VqwYwFHjAunpVUbnrbkhVrjKvhNX489rtzpOiI3jmnxuSQwjIYEuF?=
 =?us-ascii?Q?bQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0a615786-99ef-4c15-03d1-08dbc1020284
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2023 15:37:38.0214
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: MHqHm+8Mty3D5GvGCIadnUm/Fhlk4sWQDjBuyfuUQkgyUT3E93dKHyi8J+9DO9uk0buEMcR27VNXnqb4dO8e5g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8661
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 29 Sep 2023 08:37:54 -0700 (PDT)

In case the user binds multiple sockets for the same BIG, the BIG
handle should be matched with the associated adv handle, if it has
already been allocated previously.

Signed-off-by: Iulia Tanasescu <iulia.tanasescu@nxp.com>
---
 net/bluetooth/hci_conn.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index e62a5f368a51..7890ec449a7b 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1494,6 +1494,18 @@ static int qos_set_bis(struct hci_dev *hdev, struct bt_iso_qos *qos)
 
 	/* Allocate BIS if not set */
 	if (qos->bcast.bis == BT_ISO_QOS_BIS_UNSET) {
+		if (qos->bcast.big != BT_ISO_QOS_BIG_UNSET) {
+			conn = hci_conn_hash_lookup_big(hdev, qos->bcast.big);
+
+			if (conn) {
+				/* If the BIG handle is already matched to an advertising
+				 * handle, do not allocate a new one.
+				 */
+				qos->bcast.bis = conn->iso_qos.bcast.bis;
+				return 0;
+			}
+		}
+
 		/* Find an unused adv set to advertise BIS, skip instance 0x00
 		 * since it is reserved as general purpose set.
 		 */
-- 
2.39.2