summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMarcel Holtmann2014-07-02 11:30:51 +0200
committerMarcel Holtmann2014-07-03 17:42:56 +0200
commit96c2103a57c5c6498138f38df926af6b86ea4e86 (patch)
treeedfc93128f1602617dad81a625aa2c8de885d02b /net
parentBluetooth: Add public address configration for Intel USB devices (diff)
downloadkernel-qcow2-linux-96c2103a57c5c6498138f38df926af6b86ea4e86.tar.gz
kernel-qcow2-linux-96c2103a57c5c6498138f38df926af6b86ea4e86.tar.xz
kernel-qcow2-linux-96c2103a57c5c6498138f38df926af6b86ea4e86.zip
Bluetooth: Default to internal use manufacturer identifier
When allocating a new controller structure, then default to the internal use value 0xffff first. Default to 0x0000 is a bad idea since that is the manufacturer identifier of Ericsson Technology Licensing. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 63197d70d8eb..21a4c8dfb874 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3796,6 +3796,7 @@ struct hci_dev *hci_alloc_dev(void)
hdev->link_mode = (HCI_LM_ACCEPT);
hdev->num_iac = 0x01; /* One IAC support is mandatory */
hdev->io_capability = 0x03; /* No Input No Output */
+ hdev->manufacturer = 0xffff; /* Default to internal use */
hdev->inq_tx_power = HCI_TX_POWER_INVALID;
hdev->adv_tx_power = HCI_TX_POWER_INVALID;