diff options
| author |   Danny Kukawka <danny.kukawka@bisect.de> | 2012-02-15 06:45:40 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-02-15 15:34:17 -0500 |
| commit | 7ce5d222190cb3ce3ae88bafde7c4fa52a5103e0 (patch) | |
| tree | 2b284365b7a2e11d4ba286a589bd35bc39918805 /drivers/net/ethernet/nvidia | |
| parent | net: replace random_ether_addr() with eth_hw_addr_random() (diff) | |
| download | linux-dev-7ce5d222190cb3ce3ae88bafde7c4fa52a5103e0.tar.xz linux-dev-7ce5d222190cb3ce3ae88bafde7c4fa52a5103e0.zip | |
net: use eth_hw_addr_random() and reset addr_assign_type
Use eth_hw_addr_random() instead of calling random_ether_addr()
to set addr_assign_type correctly to NET_ADDR_RANDOM.
Reset the state to NET_ADDR_PERM as soon as the MAC get
changed via .ndo_set_mac_address.
v2: adapt to renamed eth_hw_addr_random()
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/nvidia')
| -rw-r--r-- | drivers/net/ethernet/nvidia/forcedeth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 5eeb92f87380..8561dd25db66 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c @@ -3022,6 +3022,7 @@ static int nv_set_mac_address(struct net_device *dev, void *addr) /* synchronized against open : rtnl_lock() held by caller */ memcpy(dev->dev_addr, macaddr->sa_data, ETH_ALEN); + dev->addr_assign_type &= ~NET_ADDR_RANDOM; if (netif_running(dev)) { netif_tx_lock_bh(dev); @@ -5741,7 +5742,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i dev_err(&pci_dev->dev, "Invalid MAC address detected: %pM - Please complain to your hardware vendor.\n", dev->dev_addr); - random_ether_addr(dev->dev_addr); + eth_hw_addr_random(dev); dev_err(&pci_dev->dev, "Using random MAC address: %pM\n", dev->dev_addr); } |