summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/btmrvl_main.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2016-07-05 14:30:14 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2016-07-09 21:37:13 +0300
commitca8bee5dde1f02c2dbe8c8453dce27f2dfafb21c (patch)
tree79ca6c942f1c5e618ac7363edaa549466c9b1b61 /drivers/bluetooth/btmrvl_main.c
parente14dbe72033152135eb3bae212228728089d4dd9 (diff)
downloadlinux-stable-ca8bee5dde1f02c2dbe8c8453dce27f2dfafb21c.tar.gz
linux-stable-ca8bee5dde1f02c2dbe8c8453dce27f2dfafb21c.tar.bz2
linux-stable-ca8bee5dde1f02c2dbe8c8453dce27f2dfafb21c.zip
Bluetooth: Rename HCI_BREDR into HCI_PRIMARY
The HCI_BREDR naming is confusing since it actually stands for Primary Bluetooth Controller. Which is a term that has been used in the latest standard. However from a legacy point of view there only really have been Basic Rate (BR) and Enhanced Data Rate (EDR). Recent versions of Bluetooth introduced Low Energy (LE) and made this terminology a little bit confused since Dual Mode Controllers include BR/EDR and LE. To simplify this the name HCI_PRIMARY stands for the Primary Controller which can be a single mode or dual mode controller. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'drivers/bluetooth/btmrvl_main.c')
-rw-r--r--drivers/bluetooth/btmrvl_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 7ad8d61c0c61..e6a85f0e6309 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -138,7 +138,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
if (event->length > 3 && event->data[3])
priv->btmrvl_dev.dev_type = HCI_AMP;
else
- priv->btmrvl_dev.dev_type = HCI_BREDR;
+ priv->btmrvl_dev.dev_type = HCI_PRIMARY;
BT_DBG("dev_type: %d", priv->btmrvl_dev.dev_type);
} else if (priv->btmrvl_dev.sendcmdflag &&