mirror of https://gitee.com/openkylin/linux.git
Bluetooth: 6lowpan: Set the peer IPv6 address correctly
The peer IPv6 address contained wrong U/L bit in the EUI-64 part. Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org # 3.17.x
This commit is contained in:
parent
2ae50d8d3a
commit
b2799cec22
|
@ -671,6 +671,14 @@ static struct l2cap_chan *chan_open(struct l2cap_chan *pchan)
|
|||
return chan;
|
||||
}
|
||||
|
||||
static void set_ip_addr_bits(u8 addr_type, u8 *addr)
|
||||
{
|
||||
if (addr_type == BDADDR_LE_PUBLIC)
|
||||
*addr |= 0x02;
|
||||
else
|
||||
*addr &= ~0x02;
|
||||
}
|
||||
|
||||
static struct l2cap_chan *add_peer_chan(struct l2cap_chan *chan,
|
||||
struct lowpan_dev *dev)
|
||||
{
|
||||
|
@ -693,6 +701,11 @@ static struct l2cap_chan *add_peer_chan(struct l2cap_chan *chan,
|
|||
memcpy(&peer->eui64_addr, (u8 *)&peer->peer_addr.s6_addr + 8,
|
||||
EUI64_ADDR_LEN);
|
||||
|
||||
/* IPv6 address needs to have the U/L bit set properly so toggle
|
||||
* it back here.
|
||||
*/
|
||||
set_ip_addr_bits(chan->dst_type, (u8 *)&peer->peer_addr.s6_addr + 8);
|
||||
|
||||
write_lock_irqsave(&devices_lock, flags);
|
||||
INIT_LIST_HEAD(&peer->list);
|
||||
peer_add(dev, peer);
|
||||
|
|
Loading…
Reference in New Issue