summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2013-10-01 22:59:20 -0700
committerJohan Hedberg <johan.hedberg@intel.com>2013-10-02 09:09:54 +0300
commit60f2a3ed7beb2e9b8f2c63de0895f587e0c1ca76 (patch)
treebda8bb685d27922b3cb5a342520a215b0b8a78c8 /net/bluetooth
parent1025c04cecd19882e28f16c4004034b475c372c5 (diff)
downloadop-kernel-dev-60f2a3ed7beb2e9b8f2c63de0895f587e0c1ca76.zip
op-kernel-dev-60f2a3ed7beb2e9b8f2c63de0895f587e0c1ca76.tar.gz
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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 4549b5c..dd2528c5 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)) {
OpenPOWER on IntegriCloud