linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] bluetooth: ask for MWS transport config only if controller supports 4.1
@ 2015-09-15  9:24 Simon Fels
  2015-09-15  9:32 ` Marcel Holtmann
  0 siblings, 1 reply; 7+ messages in thread
From: Simon Fels @ 2015-09-15  9:24 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Simon Fels

Some controllers doesn't seem to clear the bitfield to indicate which
HCI commands are supported correctly. This leads to wrong conclusions
which HCI commands we can send at initialization time. In this case
the problem appeared with the command to retrieve the MWS transport
configuration which is only available since version 4.1

Signed-off-by: Simon Fels <simon.fels@canonical.com>
---
 include/net/bluetooth/bluetooth.h | 2 +-
 net/bluetooth/hci_core.c          | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index fcf2ae7..0861477 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -37,7 +37,7 @@
 /* Bluetooth versions */
 #define BLUETOOTH_VER_1_1	1
 #define BLUETOOTH_VER_1_2	2
-#define BLUETOOTH_VER_2_0	3
+#define BLUETOOTH_VER_4_1	7
 
 /* Reserv for core and drivers use */
 #define BT_SKB_RESERVE	8
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index a7cdd99..f376ab6 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -824,8 +824,13 @@ static void hci_init4_req(struct hci_request *req, unsigned long opt)
 	if (hdev->commands[29] & 0x20)
 		hci_req_add(req, HCI_OP_READ_LOCAL_CODECS, 0, NULL);
 
-	/* Get MWS transport configuration if the HCI command is supported */
-	if (hdev->commands[30] & 0x08)
+	/* Get MWS transport configuration if the HCI command is supported
+	 * but only when reported HCI version is at minimum 4.1. Some
+	 * controllers doesn't seem to clear the bit field they transmit
+	 * correctly so all resevered fields are invalid and let to
+	 * failing commands */
+	if (hdev->hci_ver >= BLUETOOTH_VER_4_1 &&
+		hdev->commands[30] & 0x08)
 		hci_req_add(req, HCI_OP_GET_MWS_TRANSPORT_CONFIG, 0, NULL);
 
 	/* Check for Synchronization Train support */
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2015-09-16  9:50 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-15  9:24 [PATCH] bluetooth: ask for MWS transport config only if controller supports 4.1 Simon Fels
2015-09-15  9:32 ` Marcel Holtmann
2015-09-15 10:10   ` Simon Fels
2015-09-16  2:36     ` Marcel Holtmann
2015-09-16  5:25       ` Simon Fels
2015-09-16  9:01         ` Marcel Holtmann
2015-09-16  9:50           ` Simon Fels

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).