Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

bluetooth: Set 6 byte device addresses

Browse Source 
Set BTLE MAC addresses that are 6 bytes long and not 8 bytes
that are used in other places with 6lowpan.

Signed-off-by: Patrik Flykt <patrik.flykt@linux.intel.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Patrik Flykt 2017-03-12 10:19:33 +02:00 committed by Marcel Holtmann
parent 730ce397cd
commit c259d1413b
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/bluetooth/6lowpan.c
View File

@ -80,6 +80,8 @@ struct lowpan_btle_dev {
struct delayed_work notify_peers; struct delayed_work notify_peers;
}; };
static void set_addr(u8 *eui, u8 *addr, u8 addr_type);
static inline struct lowpan_btle_dev * static inline struct lowpan_btle_dev *
lowpan_btle_dev(const struct net_device *netdev) lowpan_btle_dev(const struct net_device *netdev)
{ {
@ -272,9 +274,10 @@ static int give_skb_to_upper(struct sk_buff *skb, struct net_device *dev)
static int iphc_decompress(struct sk_buff *skb, struct net_device *netdev, static int iphc_decompress(struct sk_buff *skb, struct net_device *netdev,
struct l2cap_chan *chan) struct l2cap_chan *chan)
{ {
const u8 *saddr, *daddr; const u8 *saddr;
struct lowpan_btle_dev *dev; struct lowpan_btle_dev *dev;
struct lowpan_peer *peer; struct lowpan_peer *peer;
unsigned char eui64_daddr[EUI64_ADDR_LEN];
dev = lowpan_btle_dev(netdev); dev = lowpan_btle_dev(netdev);
@ -285,9 +288,9 @@ static int iphc_decompress(struct sk_buff *skb, struct net_device *netdev,
return -EINVAL; return -EINVAL;
saddr = peer->eui64_addr; saddr = peer->eui64_addr;
daddr = dev->netdev->dev_addr; set_addr(&eui64_daddr[0], chan->src.b, chan->src_type);
return lowpan_header_decompress(skb, netdev, daddr, saddr); return lowpan_header_decompress(skb, netdev, &eui64_daddr, saddr);
} }
static int recv_pkt(struct sk_buff *skb, struct net_device *dev, static int recv_pkt(struct sk_buff *skb, struct net_device *dev,
@ -681,13 +684,6 @@ static void set_addr(u8 *eui, u8 *addr, u8 addr_type)
BT_DBG("type %d addr %*phC", addr_type, 8, eui); BT_DBG("type %d addr %*phC", addr_type, 8, eui);
} }
static void set_dev_addr(struct net_device *netdev, bdaddr_t *addr,
u8 addr_type)
{
netdev->addr_assign_type = NET_ADDR_PERM;
set_addr(netdev->dev_addr, addr->b, addr_type);
}
static void ifup(struct net_device *netdev) static void ifup(struct net_device *netdev)
{ {
int err; int err;
@ -803,7 +799,8 @@ static int setup_netdev(struct l2cap_chan *chan, struct lowpan_btle_dev **dev)
if (!netdev) if (!netdev)
return -ENOMEM; return -ENOMEM;
set_dev_addr(netdev, &chan->src, chan->src_type); netdev->addr_assign_type = NET_ADDR_PERM;
baswap((void *)netdev->dev_addr, &chan->src);
netdev->netdev_ops = &netdev_ops; netdev->netdev_ops = &netdev_ops;
SET_NETDEV_DEV(netdev, &chan->conn->hcon->hdev->dev); SET_NETDEV_DEV(netdev, &chan->conn->hcon->hdev->dev);