Merge branch 'bluetooth-don-t-write-directly-to-netdev-dev_addr'
Jakub Kicinski says: ==================== bluetooth: don't write directly to netdev->dev_addr The usual conversions. ==================== Link: https://lore.kernel.org/r/20211022231834.2710245-1-kuba@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Коммит
dcd63d4326
|
@ -663,6 +663,7 @@ static struct l2cap_chan *add_peer_chan(struct l2cap_chan *chan,
|
|||
static int setup_netdev(struct l2cap_chan *chan, struct lowpan_btle_dev **dev)
|
||||
{
|
||||
struct net_device *netdev;
|
||||
bdaddr_t addr;
|
||||
int err;
|
||||
|
||||
netdev = alloc_netdev(LOWPAN_PRIV_SIZE(sizeof(struct lowpan_btle_dev)),
|
||||
|
@ -672,7 +673,8 @@ static int setup_netdev(struct l2cap_chan *chan, struct lowpan_btle_dev **dev)
|
|||
return -ENOMEM;
|
||||
|
||||
netdev->addr_assign_type = NET_ADDR_PERM;
|
||||
baswap((void *)netdev->dev_addr, &chan->src);
|
||||
baswap(&addr, &chan->src);
|
||||
__dev_addr_set(netdev, &addr, sizeof(addr));
|
||||
|
||||
netdev->netdev_ops = &netdev_ops;
|
||||
SET_NETDEV_DEV(netdev, &chan->conn->hcon->hdev->dev);
|
||||
|
|
|
@ -594,7 +594,7 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
|
|||
* ie. eh.h_dest is our local address. */
|
||||
memcpy(s->eh.h_dest, &src, ETH_ALEN);
|
||||
memcpy(s->eh.h_source, &dst, ETH_ALEN);
|
||||
memcpy(dev->dev_addr, s->eh.h_dest, ETH_ALEN);
|
||||
eth_hw_addr_set(dev, s->eh.h_dest);
|
||||
|
||||
s->dev = dev;
|
||||
s->sock = sock;
|
||||
|
|
Загрузка…
Ссылка в новой задаче