summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorClaudio Takahasi <claudio.takahasi@openbossa.org>2014-01-07 13:07:47 +0100
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2014-01-07 14:32:11 +0100
commitb071a620995def138bf5f5da8440d93bde4171d3 (patch)
treedb8e1afd4010e05534ac5a4ccedb37d9f993d443 /net/bluetooth
parentBluetooth: Remove rfcomm_carrier_raised() (diff)
downloadlinux-b071a620995def138bf5f5da8440d93bde4171d3.tar.xz
linux-b071a620995def138bf5f5da8440d93bde4171d3.zip
Bluetooth: Fix setting Universal/Local bit
This patch fixes the Bluetooth Low Energy Address type checking when setting Universal/Local bit for the 6loWPAN network device or for the peer device connection. ADDR_LE_DEV_PUBLIC or ADDR_LE_DEV_RANDOM are the values allowed for "src_type" and "dst_type" in the hci_conn struct. The Bluetooth link type can be obtainned reading the "type" field in the same struct. Signed-off-by: Claudio Takahasi <claudio.takahasi@openbossa.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/6lowpan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index 5f0b11d94d95..ab4e7712457b 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -623,7 +623,7 @@ static void set_addr(u8 *eui, u8 *addr, u8 addr_type)
eui[0] ^= 2;
/* Universal/local bit set, RFC 4291 */
- if (addr_type == BDADDR_LE_PUBLIC)
+ if (addr_type == ADDR_LE_DEV_PUBLIC)
eui[0] |= 1;
else
eui[0] &= ~1;