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>

diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index 6307a4e..c275dc1 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -1425,7 +1425,7 @@ static int prism2_hw_init2(struct net_device *dev, int initial)
                }
                list_for_each(ptr, &local->hostap_interfaces) {
                        iface = list_entry(ptr, struct hostap_interface, list);
-                       memcpy(iface->dev->dev_addr, dev->dev_addr, ETH_ALEN);
+                       eth_hw_addr_inherit(iface->dev, dev);
                }
        } else if (local->fw_ap)
                prism2_check_sta_fw_version(local);

diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index e4f56ad..a1257c9 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -66,7 +66,7 @@ struct net_device * hostap_add_interface(struct local_info *local,
        list_add(&iface->list, &local->hostap_interfaces);
 
        mdev = local->dev;
-       memcpy(dev->dev_addr, mdev->dev_addr, ETH_ALEN);
+       eth_hw_addr_inherit(dev, mdev);
        dev->base_addr = mdev->base_addr;
        dev->irq = mdev->irq;
        dev->mem_start = mdev->mem_start;