From: Marcel Holtmann Date: Wed, 2 Jul 2014 09:30:51 +0000 (+0200) Subject: Bluetooth: Default to internal use manufacturer identifier X-Git-Tag: firefly_0821_release~176^2~3474^2~12^2~41^2~181 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=96c2103a57c5c6498138f38df926af6b86ea4e86;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Johan Hedberg --- 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;