From: Marcel Holtmann <marcel@holtmann.org>
Date: Wed, 2 Oct 2013 05:59:20 +0000 (-0700)
Subject: Bluetooth: Use only 2 bits for controller type information
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=60f2a3ed7beb2e9b8f2c63de0895f587e0c1ca76;p=openwrt%2Fstaging%2Fblogic.git

Bluetooth: Use only 2 bits for controller type information

The controller type is limited to BR/EDR/LE and AMP controllers. This
can be easily encoded with just 2 bits and still leave enough room
for future controller types.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 4549b5cbfac5..dd2528c5b6bc 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1610,7 +1610,7 @@ int hci_get_dev_info(void __user *arg)
 
 	strcpy(di.name, hdev->name);
 	di.bdaddr   = hdev->bdaddr;
-	di.type     = (hdev->bus & 0x0f) | (hdev->dev_type << 4);
+	di.type     = (hdev->bus & 0x0f) | ((hdev->dev_type & 0x03) << 4);
 	di.flags    = hdev->flags;
 	di.pkt_type = hdev->pkt_type;
 	if (lmp_bredr_capable(hdev)) {