Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit db181347e838ec87e31e2488697b6f0eea418e5a

Authored by Bjørn Mork
Committed by David S. Miller
1 parent 252352cb5e
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

net: hostap: inherit addr_assign_type along with dev_addr 

A device inheriting a random or set address should reflect this in
its addr_assign_type.

Cc: Jouni Malinen <j@w1.fi>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

drivers/net/wireless/hostap/hostap_hw.c
Diff comments   View file @ db18134
... ... @@ -1425,7 +1425,7 @@
1425 1425 }
1426 1426 list_for_each(ptr, &local->hostap_interfaces) {
1427 1427 iface = list_entry(ptr, struct hostap_interface, list);
1428   - memcpy(iface->dev->dev_addr, dev->dev_addr, ETH_ALEN);
  1428 + eth_hw_addr_inherit(iface->dev, dev);
1429 1429 }
1430 1430 } else if (local->fw_ap)
1431 1431 prism2_check_sta_fw_version(local);
drivers/net/wireless/hostap/hostap_main.c
Diff comments   View file @ db18134
... ... @@ -66,7 +66,7 @@
66 66 list_add(&iface->list, &local->hostap_interfaces);
67 67  
68 68 mdev = local->dev;
69   - memcpy(dev->dev_addr, mdev->dev_addr, ETH_ALEN);
  69 + eth_hw_addr_inherit(dev, mdev);
70 70 dev->base_addr = mdev->base_addr;
71 71 dev->irq = mdev->irq;
72 72 dev->mem_start = mdev->mem_start;