Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 314cb11b authored by Bjørn Mork's avatar Bjørn Mork Committed by David S. Miller
Browse files

staging: vt6655: 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: Forest Bond <forest@alittletooquiet.net>
Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d32a96e2

drivers/staging/vt6655/hostap.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked) 


	apdev_priv = netdev_priv(pDevice->apdev);

	*apdev_priv = *pDevice;

	memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);

	eth_hw_addr_inherit(pDevice->apdev, dev);



	pDevice->apdev->netdev_ops = &apdev_netdev_ops;

drivers/staging/vt6655/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) 
		}

		if (sValue.dwValue == 1) {

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "up wpadev\n");

			memcpy(pDevice->wpadev->dev_addr, pDevice->dev->dev_addr, ETH_ALEN);

			eth_hw_addr_inherit(pDevice->wpadev, pDevice->dev);

			pDevice->bWPADEVUp = true;

		} else {

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "close wpadev\n");

drivers/staging/vt6655/wpactl.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int wpa_init_wpadev(PSDevice pDevice) 


	wpadev_priv = netdev_priv(pDevice->wpadev);

	*wpadev_priv = *pDevice;

	memcpy(pDevice->wpadev->dev_addr, dev->dev_addr, ETH_ALEN);

	eth_hw_addr_inherit(pDevice->wpadev, dev);

	pDevice->wpadev->base_addr = dev->base_addr;

	pDevice->wpadev->irq = dev->irq;

	pDevice->wpadev->mem_start = dev->mem_start;