Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-1720-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Andrei Istodorescu <andrei.istodorescu@nxp.com>
To: linux-bluetooth@vger.kernel.org
Cc: luiz.dentz@gmail.com,
	mihai-octavian.urzica@nxp.com,
	silviu.barbulescu@nxp.com,
	vlad.pruteanu@nxp.com,
	iulia.tanasescu@nxp.com,
	Andrei Istodorescu <andrei.istodorescu@nxp.com>
Subject: [PATCH BlueZ v2 3/6] btio: Check for non-zero qos before setting
Date: Fri,  9 Feb 2024 18:46:27 +0200
Message-Id: <20240209164630.92208-4-andrei.istodorescu@nxp.com>
In-Reply-To: <20240209164630.92208-1-andrei.istodorescu@nxp.com>
References: <20240209164630.92208-1-andrei.istodorescu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?Ty4n7OdyRLfwVNPDq9SHKxviEIge0d2wEMXZrRHstQ0SeFAQslM5NleiDzjn?=
 =?us-ascii?Q?mWpogx+9L9Xb7pPi1xudXZJsSQMSTseNwLlvbVPQjSXs2vdagvJKUR/RSr8V?=
 =?us-ascii?Q?HJDBSuk0FXpjcEl7FYdEVMEMhoGgGn4iHEWheRppvkWgsz/8SRM0yyiX0b/0?=
 =?us-ascii?Q?+/iLdIuzm98/ez3wjBx9KjSVxSVYOypO2Nyv+gsjNgTNqMqYAvKm5LK8sRda?=
 =?us-ascii?Q?qacBC6hNrJNmpK3b3+od44cavYRVGBCErF0QYYccVxvhDhxq08SxeSO3tSBc?=
 =?us-ascii?Q?AAGf6ftH+wD221u6PCbr12G4zMd02qSaHo5D7MFJ5eO0boJtjydkdzjKY5Ld?=
 =?us-ascii?Q?aRKWmy4AMAp52ZKyhQqntLwlMsLqs2uP9pJg2Z6onVa88kajUnA1pURTZUKd?=
 =?us-ascii?Q?JclOdm20Lt3dWx4FFBc/sXbtn1PRk8tUkZyy6jt74v7EwI9y6AdU/sPhnB/Y?=
 =?us-ascii?Q?xyn4MllnxOFC1ZGaJac3NALaMxggvziUpNrhHNGAtCiD2R+inNjTmFJo8NlE?=
 =?us-ascii?Q?x3FNbDaw0GEY54+94FCPAdXMT7h7/k0DOR9/JNruOvZB2BupE6VIcGYGPIqw?=
 =?us-ascii?Q?5JGAD2oRhguQo0yDl8/5GoNZjczbWooVeoQ3MgCv/iKZ6roTm23rNXiVi+ZC?=
 =?us-ascii?Q?Ld7LG+nDlSLaN7E3tcYqP781JGeRtMsYkNsN6gaVOB/ErMUwLIoOZO0eY+34?=
 =?us-ascii?Q?vLZe+LkxbzsTwgI+PXPyM23UmCKvtQ/coW+LDXEdwO+5Be09/fstqCPXoMrh?=
 =?us-ascii?Q?bifm+JfSoz2uB9GIts1SikoVAKEdiq0nK45R97xpwhlu2zhg1ukDSDRoB0Mn?=
 =?us-ascii?Q?Ol2w9iKUfu068Y3qCXrmPKf3etti4kCJJCgmcg1TjHj752dC0At6asTfcu0d?=
 =?us-ascii?Q?8tw61/I2vVPCYEU1JWH/J0geR/z1D1V3/JgAOkCcq5xV6CW8B6xWhZ0nONC6?=
 =?us-ascii?Q?wOAbp8vCp6s2d3+M4cz0uxue/IW3pqs6XwtXNLioNYKO8gbZuvGhImCzndT1?=
 =?us-ascii?Q?qvVRVCSW2tWMNbZ4JPJTBqlVAYSA6eCO6EtA2unJWScJR9f8ERIepBwigZis?=
 =?us-ascii?Q?svHufc49IfYCUqq3kVPWd7JsYLqTuaMYzw2HRPimoed0ixB4IBZwVdqHEcWa?=
 =?us-ascii?Q?h2SA65iPHERv8pmqoILd6OEONPIIzczVBPklPjuMhvrRh1LAIdw7ACdW/fA0?=
 =?us-ascii?Q?Kk3CvHgkw2Sa6zfBnMuFHnf+sFJi98myc5b6JkEt/t3vFGYCrrmZbmTLjbk1?=
 =?us-ascii?Q?64Zo5CsxYy0thUBew0j9PmvgJbKBj83KufzZ3GlXiHUhQTDYs7ZDAQ1D4Ce2?=
 =?us-ascii?Q?bRxBUdfGBoUzKfNnQRENGTaBm5q+9uV9sjrUzn7PFcfPepDBnc4clKdGJrLd?=
 =?us-ascii?Q?KL0JfIRtidOYtW5hAdQZeY59GJxeUf41knHpBoxEkp7yYzVMKXdnNI8ITD9o?=
 =?us-ascii?Q?rW9nLW0Z/IPQ+VwXZw0qBb8JqSiiwTZUsvNqxm19OGjdb+6b66WUsw3OL9QQ?=
 =?us-ascii?Q?hnQjZGVo9xEZe38X1WyWrlKg5l5A8+GbYCO/QlRSoXgVMtq1TxpVYY1CoNsM?=
 =?us-ascii?Q?SuVXgx2KGKDKcGmq/CXBLF7cUZNMnJsP8su9txrwqS95XFJuSxoct3Nu/S6V?=
 =?us-ascii?Q?MA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c07690a8-a7da-474e-db3d-08dc298eaf47
X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8938.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2024 16:46:38.3511
 (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: 2kiZH3H7vP3aeKvrar/IK6J7V0WCC+9koVBvQWpxZHfoFg0Alarw8tOduvmcOjhaRuVOvRKK/iVlP/H8kmjiYbSVsKOA8xEi3KSzMjJW/cY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB7097

---
 btio/btio.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/btio/btio.c b/btio/btio.c
index d30cfcac73ee..5a07f91c7d61 100644
--- a/btio/btio.c
+++ b/btio/btio.c
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2009-2010  Marcel Holtmann <marcel@holtmann.org>
  *  Copyright (C) 2009-2010  Nokia Corporation
- *  Copyright 2023 NXP
+ *  Copyright 2023-2024 NXP
  *
  *
  */
@@ -1981,7 +1981,9 @@ static GIOChannel *create_io(gboolean server, struct set_opts *opts,
 		if (!sco_set(sock, opts->mtu, opts->voice, err))
 			goto failed;
 		break;
-	case BT_IO_ISO:
+	case BT_IO_ISO: {
+		uint8_t zeroes[sizeof(opts->qos)] = {0};
+
 		sock = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_ISO);
 		if (sock < 0) {
 			ERROR_FAILED(err, "socket(SEQPACKET, ISO)", errno);
@@ -1992,12 +1994,14 @@ static GIOChannel *create_io(gboolean server, struct set_opts *opts,
 				 &opts->dst, opts->dst_type, opts->bc_sid,
 				 opts->bc_num_bis, opts->bc_bis, err) < 0)
 			goto failed;
-		if (!iso_set_qos(sock, &opts->qos, err))
-			goto failed;
+		if (memcmp(&opts->qos, zeroes, sizeof(opts->qos)))
+			if (!iso_set_qos(sock, &opts->qos, err))
+				goto failed;
 		if (opts->base.base_len)
 			if (!iso_set_base(sock, &opts->base, err))
 				goto failed;
 		break;
+	}
 	case BT_IO_INVALID:
 	default:
 		g_set_error(err, BT_IO_ERROR, EINVAL,
-- 
2.40.1